jpeg: change to use autotools_stage_all in 6b

 - native and cross changed.  do_install is no longer required as
 - a patch has been added to fix the failure of the Makefile install
 - to create the target directory.

3 files changed, 33 insertions, 19 deletions

diff --git a/packages/jpeg/jpeg-6b/install.patch b/packages/jpeg/jpeg-6b/install.patch
new file mode 100644
index 0000000000..742594a11f
--- /dev/null
+++ b/packages/jpeg/jpeg-6b/install.patch
@@ -0,0 +1,28 @@
+--- jpeg-6b/makefile.cfg.orig	2005-12-29 12:51:05.584736333 -0800
++++ jpeg-6b/makefile.cfg	2005-12-29 12:55:05.075806556 -0800
+@@ -192,11 +192,13 @@ wrjpgcom: wrjpgcom.$(O)
+ # Installation rules:
+ 
+ install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
++	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(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) -d $(DESTDIR)$(mandir)
+ 	$(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)
+@@ -204,9 +206,11 @@ install: cjpeg djpeg jpegtran rdjpgcom w
+ 	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
+ 
+ install-lib: libjpeg.$(A) install-headers
++	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
+ 
+ install-headers: jconfig.h
++	$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	$(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
diff --git a/packages/jpeg/jpeg-native_6b.bb b/packages/jpeg/jpeg-native_6b.bb
index b617f1b6c0..420cc9fd4b 100644
--- a/packages/jpeg/jpeg-native_6b.bb
+++ b/packages/jpeg/jpeg-native_6b.bb
@@ -5,10 +5,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}"
 DEPENDS = ""
 
 do_stage() {
-        install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
-        install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h
-        install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
-        install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
-        install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
-        oe_libinstall -so libjpeg ${STAGING_LIBDIR}
+	autotools_stage_all
 }
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 49e0382b6e..277cdfa48c 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -1,3 +1,4 @@
+PR = "r1"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
@@ -9,7 +10,8 @@ LICENSE ="jpeg"
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
 	   file://ldflags.patch;patch=1 \
-	   file://paths.patch;patch=1"
+	   file://paths.patch;patch=1 \
+	   file://install.patch;patch=1"
 S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools 
@@ -20,16 +22,5 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
 CFLAGS_append = " -D_REENTRANT"
 
 do_stage() {
-	install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
-	install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h
-	install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
-	install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
-	install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
-	oe_libinstall -so libjpeg ${STAGING_LIBDIR}
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${includedir} \
-		   ${D}${mandir}/man1 ${D}${libdir}
-	oe_runmake 'DESTDIR=${D}' install
+	autotools_stage_all
 }