]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/feh/feh-1.2.7/cross.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / feh / feh-1.2.7 / cross.patch
1
2 #
3 # Patch managed by http://www.holgerschurig.de/patcher.html
4 #
5
6 Index: feh-1.2.7/Makefile.am
7 ===================================================================
8 --- feh-1.2.7.orig/Makefile.am  2004-09-03 15:30:58.000000000 -0400
9 +++ feh-1.2.7/Makefile.am       2005-03-12 19:20:36.020740008 -0500
10 @@ -5,9 +5,8 @@
11  # A list of all the files in the current directory which can be regenerated
12  MAINTAINERCLEANFILES = Makefile.in feh.spec
13  
14 -LDFLAGS           = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
15 -INCLUDES          = -I/usr/X11R6/include \
16 -$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
17 +LDFLAGS           = -L/usr/X11R6/lib
18 +INCLUDES          = $(X_CFLAGS) -I.
19  
20  man_MANS = feh.1
21  
22 Index: feh-1.2.7/src/Makefile.am
23 ===================================================================
24 --- feh-1.2.7.orig/src/Makefile.am      2004-09-04 10:19:16.000000000 -0400
25 +++ feh-1.2.7/src/Makefile.am   2005-03-12 19:21:22.806627472 -0500
26 @@ -1,11 +1,9 @@
27  # A list of all the files in the current directory which can be regenerated
28  MAINTAINERCLEANFILES = Makefile.in                             
29  
30 -LDFLAGS           = -L/usr/X11R6/lib -L/usr/local/lib -lpng
31 -INCLUDES          = -I/usr/X11R6/include $(X_CFLAGS) \
32 -                    -I$(prefix)/include -I$(includedir) \
33 +LDFLAGS           = -lpng
34 +INCLUDES          = $(X_CFLAGS) \
35                      -I. -I$(top_srcdir)/src \
36 -                    -I/usr/local/include/libpng \
37                      -DPREFIX=\""$(prefix)"\" \
38                      @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
39  LIBOBJS = @LIBOBJS@