]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/jpeg/jpeg-6b/paths.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / jpeg / jpeg-6b / paths.patch
1
2 #
3 # Patch managed by http://www.holgerschurig.de/patcher.html
4 #
5
6 --- jpeg-6b/makefile.cfg~paths.patch
7 +++ jpeg-6b/makefile.cfg
8 @@ -7,17 +7,18 @@
9  # For compiling with source and object files in different directories.
10  srcdir = @srcdir@
11  VPATH = @srcdir@
12 +DESTDIR = @DESTDIR@
13  
14  # Where to install the programs and man pages.
15  prefix = @prefix@
16  exec_prefix = @exec_prefix@
17 -bindir = $(exec_prefix)/bin
18 -libdir = $(exec_prefix)/lib
19 -includedir = $(prefix)/include
20 +bindir = @bindir@
21 +libdir = @libdir@
22 +includedir = @includedir@
23  binprefix =
24  manprefix =
25  manext = 1
26 -mandir = $(prefix)/share/man/man$(manext)
27 +mandir = @mandir@/man$(manext)
28  
29  # The name of your C compiler:
30  CC= @CC@
31 @@ -191,30 +192,30 @@
32  # Installation rules:
33  
34  install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
35 -       $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
36 -       $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
37 -       $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
38 -       $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
39 -       $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
40 -       $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
41 -       $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
42 -       $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
43 -       $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
44 -       $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
45 +       $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
46 +       $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
47 +       $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
48 +       $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
49 +       $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
50 +       $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
51 +       $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
52 +       $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
53 +       $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
54 +       $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
55  
56  install-lib: libjpeg.$(A) install-headers
57 -       $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
58 +       $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
59  
60  install-headers: jconfig.h
61 -       $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
62 -       $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
63 -       $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
64 -       $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
65 +       $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
66 +       $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
67 +       $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
68 +       $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
69  #<ballombe@debian.org>:mjpegtools require this file to build and header say:
70  # * These declarations are considered internal to the JPEG library; most
71  # * applications using the library shouldn't need to include this file.
72  # So it is not forbidden to use it, therefore it must be installed.
73 -       $(INSTALL_DATA) $(srcdir)/jpegint.h $(includedir)/jpegint.h
74 +       $(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
75  
76  clean:
77         $(RM) *.o *.lo libjpeg.a libjpeg.la