Merge http://openembedded.bkbits.net/packages

into beast.local:/home/kergoth/code/packages

2004/06/08 17:40:52-04:00 local!kergoth
Fix jpeg-6b installation.

BKrev: 40c63268BS34ggLferKdDzgJrXI8nw

2 files changed, 135 insertions, 2 deletions

diff --git a/jpeg/jpeg-6b/paths.patch b/jpeg/jpeg-6b/paths.patch
index e69de29bb2..790e6a4382 100644
--- a/jpeg/jpeg-6b/paths.patch
+++ b/jpeg/jpeg-6b/paths.patch
@@ -0,0 +1,134 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- jpeg-6b/makefile.cfg~paths.patch
++++ jpeg-6b/makefile.cfg
+@@ -7,17 +7,18 @@
+ # For compiling with source and object files in different directories.
+ srcdir = @srcdir@
+ VPATH = @srcdir@
++DESTDIR = @DESTDIR@
+ 
+ # Where to install the programs and man pages.
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = $(exec_prefix)/bin
+-libdir = $(exec_prefix)/lib
+-includedir = $(prefix)/include
++bindir = @bindir@
++libdir = @libdir@
++includedir = @includedir@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/share/man/man$(manext)
++mandir = @mandir@/man$(manext)
+ 
+ # The name of your C compiler:
+ CC= @CC@
+@@ -191,30 +192,30 @@
+ # Installation rules:
+ 
+ install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
+-	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
+-	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
+-	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
+-	$(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
+-	$(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
+-	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
++	$(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
++	$(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
++	$(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
++	$(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
++	$(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
++	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
++	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
++	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
++	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
++	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
+ 
+ install-lib: libjpeg.$(A) install-headers
+-	$(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
++	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
+ 
+ install-headers: jconfig.h
+-	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
+-	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
+-	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
+-	$(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
++	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
++	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
++	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
++	$(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
+ #<ballombe@debian.org>:mjpegtools require this file to build and header say:
+ # * These declarations are considered internal to the JPEG library; most
+ # * applications using the library shouldn't need to include this file.
+ # So it is not forbidden to use it, therefore it must be installed.
+-	$(INSTALL_DATA) $(srcdir)/jpegint.h $(includedir)/jpegint.h
++	$(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
+ 
+ clean:
+ 	$(RM) *.o *.lo libjpeg.a libjpeg.la
+--- jpeg-6b/Makefile~paths.patch
++++ jpeg-6b/Makefile
+@@ -8,6 +8,7 @@
+ # For compiling with source and object files in different directories.
+ srcdir = /home/kergoth/code/build-arm/tmp/base/jpeg-6b-r0/jpeg-6b
+ VPATH = /home/kergoth/code/build-arm/tmp/base/jpeg-6b-r0/jpeg-6b
++DESTDIR = @DESTDIR@
+ 
+ # Where to install the programs and man pages.
+ prefix = /usr
+@@ -192,30 +193,30 @@
+ # Installation rules:
+ 
+ install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom install-lib
+-	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
+-	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
+-	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
+-	$(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
+-	$(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
+-	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
++	$(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
++	$(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
++	$(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
++	$(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
++	$(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
++	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
++	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
++	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
++	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
++	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
+ 
+ install-lib: libjpeg.$(A) install-headers
+-	$(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
++	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
+ 
+ install-headers: jconfig.h
+-	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
+-	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
+-	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
+-	$(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
++	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
++	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
++	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
++	$(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
+ #<ballombe@debian.org>:mjpegtools require this file to build and header say:
+ # * These declarations are considered internal to the JPEG library; most
+ # * applications using the library shouldn't need to include this file.
+ # So it is not forbidden to use it, therefore it must be installed.
+-	$(INSTALL_DATA) $(srcdir)/jpegint.h $(includedir)/jpegint.h
++	$(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
+ 
+ clean:
+ 	$(RM) *.o *.lo libjpeg.a libjpeg.la
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index 3ac83114c3..07f743030a 100644
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -31,6 +31,5 @@ do_stage() {
 do_install() {
 	install -d ${D}/${bindir} ${D}/${includedir} \
 		   ${D}/${mandir}/man1 ${D}/${libdir}
-	oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
-		   install
+	oe_runmake 'DESTDIR=${D}' install
 }