Patchwork [meta-oe] postgresql: B!=S fix

login
register
mail settings
Submitter Armin Kuster
Date June 4, 2014, 4:29 a.m.
Message ID <1401856170-9151-1-git-send-email-akuster@mvista.com>
Download mbox | patch
Permalink /patch/73189/
State Accepted, archived
Headers show

Comments

Armin Kuster - June 4, 2014, 4:29 a.m.
This fixes a configure issue do to incorrect directory reference.

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta-oe/recipes-support/postgresql/postgresql.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index e1374fb..2858a84 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -107,14 +107,14 @@  do_configure() {
 	# do_configure_append
 	# workaround perl package related bugs
 	sed -i -e "s:-L/usr/local/lib:-L=/usr/local/lib:g" \
-	    ${S}/src/Makefile.global
+	    ${B}/src/Makefile.global
 	LIBPNA="\${STAGING_LIBDIR_NATIVE}/perl-native"
 	LIBNA="\${STAGING_LIBDIR_NATIVE}"
 	BLIBNA="\${STAGING_BASE_LIBDIR_NATIVE}"
 	sed -i -e "/^perl_archlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
-	    ${S}/src/Makefile.global
+	    ${B}/src/Makefile.global
 	sed -i -e "/^perl_privlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
-	    ${S}/src/Makefile.global
+	    ${B}/src/Makefile.global
 	# remove the rpath, replace with correct lib path
 	sed -i \
 	    -e "/^perl_embed_ldflags/s:-Wl,-rpath,${LIBNA}::g" \
@@ -124,7 +124,7 @@  do_configure() {
 	    -e "/^perl_embed_ldflags/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
 	    -e "/^perl_embed_ldflags/s:${LIBNA}:${STAGING_LIBDIR}:g"  \
 	    -e "/^perl_embed_ldflags/s:${BLIBNA}:${STAGING_BASELIBDIR}:g" \
-	${S}/src/Makefile.global
+	${B}/src/Makefile.global
 
 	# workaround perl package's libperl.so problem
 	# we are using perlnative so this perl should have same version
@@ -158,11 +158,11 @@  do_install_append() {
     oe_runmake DESTDIR=${D} -C contrib install
     # install tutorial
     install -d -m 0755 ${D}${libdir}/${BPN}/tutorial
-    install ${S}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial
+    install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial
 
     # install COPYRIGHT README HISTORY
     install -d -m 0755 ${D}${docdir}/${BPN}
-    for i in ${S}/{COPYRIGHT,README,HISTORY} ${S}/doc/{KNOWN_BUGS,MISSING_FEATURES,README*,bug.template}; do
+    for i in ${B}/{COPYRIGHT,README,HISTORY} ${B}/doc/{KNOWN_BUGS,MISSING_FEATURES,README*,bug.template}; do
         [ -f $i ] && install $i ${D}${docdir}/${BPN}
     done