From ac23d23a1ccd037f6c5e17d95c60d519e01a0cfb Mon Sep 17 00:00:00 2001
From: Albert Cahalan <albert@users.sourceforge.net>
Date: Sun, 25 May 2008 17:49:32 +0000
Subject: [PATCH] forgot "shell" in $(shell...

---
 Makefile       | 6 +++---
 src/tuxpaint.c | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f71ea94ca..09ff6ac3a 100644
--- a/Makefile
+++ b/Makefile
@@ -155,9 +155,9 @@ SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL_PANGO_LIB)
 SVG_LIB:=$(shell pkg-config --libs librsvg-2.0 cairo)
 
 # lots of -I things, so really should be SVG_CPPFLAGS
-SVG_CFLAGS:=$(pkg-config --cflags librsvg-2.0 cairo)
+SVG_CFLAGS:=$(shell pkg-config --cflags librsvg-2.0 cairo)
 
-SDL_CFLAGS:=$(shell sdl-config --cflags) $(SVG_CFLAGS)
+SDL_CFLAGS:=$(shell sdl-config --cflags)
 
 
 # SVG support (via Cairo) enabled by __SVG
@@ -959,7 +959,7 @@ obj/tuxpaint.o:	src/tuxpaint.c \
 		Makefile
 	@echo
 	@echo "...Compiling Tux Paint from source..."
-	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \
+	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \
 		-c src/tuxpaint.c -o obj/tuxpaint.o
 
 obj/i18n.o:	src/i18n.c src/i18n.h src/debug.h
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 1836b2081..cd73dde65 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -381,8 +381,10 @@ extern WrapperData macosx;
 
 #else
 
-#include "rsvg.h"
-#include "rsvg-cairo.h"
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
+//#include "rsvg.h"
+//#include "rsvg-cairo.h"
 #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
 #error "---------------------------------------------------"
 #error "If you installed libRSVG from packages, be sure"