r15551 - gnucash/trunk/packaging/win32 - Install.sh: Remove dependency_libs line from .la files in \lib too.

[Andreas Köhler]

Author: andi5
Date: 2007-02-10 09:57:33 -0500 (Sat, 10 Feb 2007)
New Revision: 15551
Trac: http://svn.gnucash.org/trac/changeset/15551

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Install.sh: Remove dependency_libs line from .la files in \lib too.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-02-10 14:47:52 UTC (rev 15550)
+++ gnucash/trunk/packaging/win32/install.sh	2007-02-10 14:57:33 UTC (rev 15551)
@@ -862,16 +862,18 @@
         make install
     qpopd
 
-    qpushd $_INSTALL_UDIR/lib/gnucash
-        # Move modules that are compiled without -module to lib/gnucash
-        mv ../bin/*.dll .
-
-        # In the installed .la files, remove the dependency_libs line and
-        # correct the 'dlname'. We do not use these files to dlopen the
-        # modules, so actually this is unneeded.
-        for A in *.la; do
+    qpushd $_INSTALL_UDIR/lib
+        # Move modules that are compiled without -module to lib/gnucash and
+        # correct the 'dlname' in the libtool archives. We do not use these
+        # files to dlopen the modules, so actually this is unneeded.
+        # Also, in all installed .la files, remove the dependency_libs line
+        mv bin/*.dll gnucash || true
+        for A in gnucash/*.la; do
             sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
         done
+        for A in *.la; do
+            sed '/dependency_libs/d' $A > tmp ; mv tmp $A
+        done
     qpopd
 
     qpushd $_INSTALL_UDIR/etc/gconf/schemas