postgresql: B!=S fix
authorArmin Kuster <akuster@mvista.com>
Wed, 4 Jun 2014 04:29:30 +0000 (21:29 -0700)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:38:40 +0000 (08:38 -0800)
This fixes a configure issue do to incorrect directory reference.

(From meta-openembedded rev: a97e06713ece10b4da7fc11e5f11bf1eca02cdf9)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-oe/recipes-support/postgresql/postgresql.inc

index e1374fb..2858a84 100644 (file)
@@ -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