#! /bin/sh /usr/share/dpatch/dpatch-run
## 01-Makefile.Configure.dpatch by Elias Mussi <elias@mussicorp.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad gingacc-io~/configure.in gingacc-io/configure.in
--- gingacc-io~/configure.in	2008-05-14 11:32:30.000000000 -0300
+++ gingacc-io/configure.in	2008-05-20 14:18:33.000000000 -0300
@@ -23,13 +23,13 @@
 
 # Bring additional directories where things might be found into our
 # search path. I don't know why autoconf doesn't do this by default
-for spfx in /usr/lib /usr/local/lib /usr/local/lib/ginga; do
+for spfx in /usr/lib /usr/local/lib /usr/local/lib/ginga /usr/lib/ginga; do
 if test -d ${spfx}; then
 LDFLAGS="-L${spfx} $LDFLAGS"
 fi
 done
 
-for spfx in /usr/include /usr/local/include /usr/local/include/ginga; do
+for spfx in /usr/include /usr/local/include /usr/local/include/ginga /usr/include/ginga; do
 if test -d ${spfx}; then
 CPPFLAGS="-I${spfx} $CPPFLAGS"
 fi
diff -urNad gingacc-io~/include/Makefile.am gingacc-io/include/Makefile.am
--- gingacc-io~/include/Makefile.am	2008-05-14 11:32:30.000000000 -0300
+++ gingacc-io/include/Makefile.am	2008-05-20 14:18:33.000000000 -0300
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-localIncludedir = /usr/local/include/ginga/io
+localIncludedir = /usr/include/ginga/io
 localInclude_HEADERS = CodeMap.h GfxManager.h GingaLocatorFactory.h \
 	InputEventListener.h \
 	InputEventManager.h Surface.h Window.h
diff -urNad gingacc-io~/src/Makefile.am gingacc-io/src/Makefile.am
--- gingacc-io~/src/Makefile.am	2008-05-14 11:32:30.000000000 -0300
+++ gingacc-io/src/Makefile.am	2008-05-20 14:18:33.000000000 -0300
@@ -1,13 +1,13 @@
 
 # set the include path found by configure
-INCLUDES = -I/usr/local/include/ginga/ -I/usr/local/include/directfb/ \
+INCLUDES = -I/usr/include/ginga/ -I/usr/include/directfb/ \
 	$(all_includes)
 
 # the library search path.
-localLibdir = /usr/local/lib/ginga
+localLibdir = /usr/lib/ginga
 
 libgingaccio_so_LDFLAGS = -Wl,-soname,libgingaccio.so -shared \
-	-L/usr/local/lib -L/usr/local/lib/ginga
+	-L/usr/lib -L/usr/lib/ginga
 localLib_PROGRAMS = libgingaccio.so
 libgingaccio_so_SOURCES = CodeMap.cpp GingaLocatorFactory.cpp GfxManager.cpp \
 	InputEventManager.cpp \