Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

1 files changed, 15 insertions, 17 deletions

diff --git a/pcre/pcre_4.4.oe b/pcre/pcre_4.4.oe
index 66bd4e86df..6aa96ebee4 100644
--- a/pcre/pcre_4.4.oe
+++ b/pcre/pcre_4.4.oe
@@ -1,22 +1,22 @@
 DEPENDS = "virtual/libc"
 RDEPENDS = "libc6"
 DESCRIPTION = "Perl-compatible regular expression library. PCRE has its own native \
-API, but a set of "wrapper" functions that are based on the POSIX API \
+API, but a set of 'wrapper' functions that are based on the POSIX API \
 are also supplied in the library libpcreposix. Note that this just \
 provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
-the POSIX-style functions is called pcreposix.h.
+the POSIX-style functions is called pcreposix.h."
 
-
-SRC_URI = ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PN}/${P}.tar.bz2 \
-	  file://${FILESDIR}/rpath.patch;patch=1 \
-	  file://${FILESDIR}/lai.patch;patch=1
-S = "${WORKDIR}/${P}"
+SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2 \
+	   file://${FILESDIR}/rpath.patch;patch=1 \
+	   file://${FILESDIR}/lai.patch;patch=1"
+S = "${WORKDIR}/pcre-${PV}"
 
 inherit autotools libtool
 
 CFLAGS_append = " -D_REENTRANT"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
+
 do_compile () {
 	${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c
 	${BUILD_CC} dftables.o -o dftables
@@ -24,15 +24,13 @@ do_compile () {
 }
 
 do_stage () {
-	install -m 0755 .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
-	ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so.0
-	install -m 0755 .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
-	ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so.0
-	
-	ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so
-	ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so
-	install -m 0644 .libs/libpcre.a ${STAGING_LIBDIR}/
+	oe_soinstall .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
 	install -m 0644 .libs/libpcreposix.a ${STAGING_LIBDIR}/
-	install -m 0644 pcre.h ${STAGING_DIR}/target/include/
-	install -m 0644 pcreposix.h ${STAGING_DIR}/target/include/
+	install -m 0644 .libs/libpcreposix.lai ${STAGING_LIBDIR}/libpcreposix.la
+	oe_soinstall .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libpcre.a ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libpcre.lai ${STAGING_LIBDIR}/libpcre.la
+	
+	install -m 0644 pcre.h ${STAGING_INCDIR}/
+	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
 }