From: Chris Larson <clarson@kergoth.com>
Date: Thu, 27 Nov 2003 07:15:20 +0000 (+0000)
Subject: Update to cups 1.1.20 final, Fix the psmic build (m4 files added), fix the do_stage... 
X-Git-Tag: Release-2010-05/1~20538
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbd57575610905473e21cffb01a94ba8f2f72c7f;p=openembedded.git

Update to cups 1.1.20 final, Fix the psmic build (m4 files added), fix the do_stage target for fixesext, and add libtool to inherit for xdmcp and xfont.

BKrev: 3fc5a488cy5iTlGH-gKXNrxRynxM6g
---

diff --git a/cups/cups_1.1.20rc6.oe b/cups/cups_1.1.20.oe
similarity index 100%
rename from cups/cups_1.1.20rc6.oe
rename to cups/cups_1.1.20.oe
diff --git a/fixesext/fixesext-cvs.oe b/fixesext/fixesext-cvs.oe
index 109a94e335..e138eb5fd1 100644
--- a/fixesext/fixesext-cvs.oe
+++ b/fixesext/fixesext-cvs.oe
@@ -10,6 +10,10 @@ S=${WORKDIR}/FixesExt
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_DIR}/target/include libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-
+	oe_runmake install DESTDIR=${STAGING_DIR} \
+	       bindir=/build/bin \
+	       includedir=/target/include \
+	       libdir=/target/lib \
+	       datadir=/share
+	       prefix=
 }
diff --git a/psmisc/psmisc-20.2/m4.patch b/psmisc/psmisc-20.2/m4.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/psmisc/psmisc_20.2.oe b/psmisc/psmisc_20.2.oe
index 7443c62922..ff3078dbf6 100644
--- a/psmisc/psmisc_20.2.oe
+++ b/psmisc/psmisc_20.2.oe
@@ -6,7 +6,8 @@ RDEPENDS="libc6 libncurses5"
 DEPENDS=virtual/libc ncurses
 
 SRC_URI="${SOURCEFORGE_MIRROR}/psmisc/psmisc-20.2.tar.gz \
-	 file://${FILESDIR}/configure.patch;patch=1"
+	 file://${FILESDIR}/configure.patch;patch=1 \
+	 file://${FILESDIR}/m4.patch;patch=1"
 S="${WORKDIR}/${P}"
 
 inherit autotools
diff --git a/xdmcp/xdmcp-cvs.oe b/xdmcp/xdmcp-cvs.oe
index 6ff9b798ce..e3723f0cea 100644
--- a/xdmcp/xdmcp-cvs.oe
+++ b/xdmcp/xdmcp-cvs.oe
@@ -7,7 +7,7 @@ DEPENDS=virtual/libc xproto-cvs
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp
 S=${WORKDIR}/Xdmcp
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig libtool
 
 do_stage() {
 	oe_runmake install DESTDIR=${STAGING_DIR} \
diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
index 8684415b4a..5d6aa6a6e4 100644
--- a/xfont/xfont-cvs.oe
+++ b/xfont/xfont-cvs.oe
@@ -7,7 +7,7 @@ DEPENDS=virtual/libc zlib xproto-cvs
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont
 S=${WORKDIR}/Xfont
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig libtool
 
 do_stage() {
 	oe_runmake install DESTDIR=${STAGING_DIR} \