#! /bin/sh /usr/share/dpatch/dpatch-run ## 01-arrumando-makefile-configure.in.dpatch by Elias Mussi ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad gingancl~/configure.in gingancl/configure.in --- gingancl~/configure.in 2008-05-14 11:32:25.000000000 -0300 +++ gingancl/configure.in 2008-05-30 21:55:52.000000000 -0300 @@ -9,13 +9,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/lib/ /usr/lib/ginga/ /usr/lib/directfb/ /usr/lib/directfb-1.0-0/; 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/include/ /usr/include/ginga/ /usr/include/lua5.1/; do if test -d ${spfx}; then CPPFLAGS="-I${spfx} $CPPFLAGS" fi diff -urNad gingancl~/src/Makefile.am gingancl/src/Makefile.am --- gingancl~/src/Makefile.am 2008-05-14 11:32:25.000000000 -0300 +++ gingancl/src/Makefile.am 2008-05-30 21:54:53.000000000 -0300 @@ -1,6 +1,6 @@ # set the include path found by configure -INCLUDES = -I/usr/local/include/directfb/ -I/usr/local/include/ginga/ \ +INCLUDES = -I/usr/include/directfb/ -I/usr/include/ginga/ \ $(all_includes) # the library search path. @@ -13,6 +13,6 @@ -lncl30 -lncl30converter -lgingancl \ $(TUNER_LIBS) $(TSPARSER_LIBS) $(DATAPROCESSING_LIBS) -gingaNcl_LDFLAGS = -L/usr/local/lib/ginga -L/usr/local/lib -Lgingancl +gingaNcl_LDFLAGS = -L/usr/lib/ginga -L/usr/lib -Lgingancl SUBDIRS = gingancl diff -urNad gingancl~/src/gingancl/Makefile.am gingancl/src/gingancl/Makefile.am --- gingancl~/src/gingancl/Makefile.am 2008-05-14 11:32:25.000000000 -0300 +++ gingancl/src/gingancl/Makefile.am 2008-05-30 21:55:15.000000000 -0300 @@ -1,15 +1,15 @@ # set the include path found by configure -INCLUDES = -I/usr/local/include/directfb/ -I/usr/local/include/ginga/ \ +INCLUDES = -I/usr/include/directfb/ -I/usr/include/ginga/ \ $(all_includes) # the library search path. -localLibdir = /usr/local/lib/ginga +localLibdir = /usr/lib/ginga # AM_CXXFLAGS = -g libgingancl_so_LDFLAGS = -Wl,-soname,libgingancl.so -shared \ --L/usr/local/lib/ginga +-L/usr/lib/ginga localLib_PROGRAMS = libgingancl.so diff -urNad gingancl~/src/include/Makefile.am gingancl/src/include/Makefile.am --- gingancl~/src/include/Makefile.am 2008-05-14 11:32:25.000000000 -0300 +++ gingancl/src/include/Makefile.am 2008-05-30 21:54:12.000000000 -0300 @@ -1,5 +1,5 @@ METASOURCES = AUTO -localIncludedir = /usr/local/include/ginga/gingancl/ +localIncludedir = /usr/include/ginga/gingancl/ localInclude_HEADERS = AVPlayerAdapter.h AnchorEvent.h \ AttributeValueMaintainer.h AttributionEvent.h\ BeginEventTransition.h CascadingDescriptor.h \