gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2e076aa0 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/860a61fd (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/2b5f3de7 (commit)



commit 2e076aa07f32f0ba53c33edab1ddac5820ce9f95
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Dec 17 09:32:44 2014 -0800

    Move the gnome .la and .pc adjustment to before building libxml2.
    
    Libtool will do the right thing when building.

diff --git a/install-impl.sh b/install-impl.sh
index b649312..bcba8ed 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -412,6 +412,12 @@ function inst_gnome() {
             done
         qpopd
 
+        qpushd $_GNOME_UDIR/lib/pkgconfig
+            perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+            #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+        qpopd
+        fix_libtool_files ${_GNOME_UDIR}
+
         if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
             echo "Libxml2 already compiled + installed"
         else
@@ -430,12 +436,6 @@ function inst_gnome() {
             rm -rf ${TMP_UDIR}/libxml2-*
         fi
 
-        qpushd $_GNOME_UDIR/lib/pkgconfig
-            perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
-            #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
-        qpopd
-        fix_libtool_files ${_GNOME_UDIR}
-
         quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
         quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
         quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"

commit 860a61fd2b67c505053c41c01ff923ced07c5b1a
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Dec 17 09:31:05 2014 -0800

    Stop fix_lt_file() from duplicating the tag-build subdir in the libdir line.

diff --git a/functions.sh b/functions.sh
index d047811..a194f03 100644
--- a/functions.sh
+++ b/functions.sh
@@ -322,8 +322,8 @@ function fix_lt_file () {
     perl -pi.bak \
         -e"s{-L$orig_dir}{-L$target_dir}g;" \
         -e"s{([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la}{-L\1 -l\2}g;" \
-        -e"s{^libdir=.*$}{libdir='$target_dir'};" \
-        -e"s{(/c|c:)/gcdev/}{$global_udir/}g" \
+        -e"s{(/c|c:)/gcdev/}{$global_udir/}g;" \
+        -e"s{^libdir=.*$}{libdir='$target_dir'}" \
         $filename
 }
 



Summary of changes:
 functions.sh    |  4 ++--
 install-impl.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)