summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-11-09 00:31:18 +0000
committerTor Lillqvist <tml@src.gnome.org>2006-11-09 00:31:18 +0000
commit5239afe019e2ef9eb7ef1377e969459fbc3f461c (patch)
treebc0d88bbf5227fd070d63d9b69995531d1d5faba
parentea0968be01dc013c6ec1f7ee5d6a5a6194df7096 (diff)
downloadlibrsvg-5239afe019e2ef9eb7ef1377e969459fbc3f461c.tar.gz
DLLs are always in "bin" nowadays, no need to ponder that in the script.
2006-11-09 Tor Lillqvist <tml@novell.com> * librsvg-zip.in: DLLs are always in "bin" nowadays, no need to ponder that in the script. Use pkg-config to find out gtk_binary_version to use it in the pathnames to the engine and loader DLLs.
-rw-r--r--ChangeLog7
-rwxr-xr-xlibrsvg-zip.in15
2 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cb204be..74a2e32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-09 Tor Lillqvist <tml@novell.com>
+
+ * librsvg-zip.in: DLLs are always in "bin" nowadays, no need to
+ ponder that in the script. Use pkg-config to find out
+ gtk_binary_version to use it in the pathnames to the engine and
+ loader DLLs.
+
2006-11-02 Dom Lachowicz <domlachowicz@gmail.com>
* configure.in: 2.16.1
diff --git a/librsvg-zip.in b/librsvg-zip.in
index 21ab7195..4ae45dc8 100755
--- a/librsvg-zip.in
+++ b/librsvg-zip.in
@@ -14,11 +14,8 @@ DLLNAME=librsvg-2-@LIBRSVG_MAJOR_VERSION@.dll
cd @prefix@
rm $ZIP
-DLLDIR=lib
-[ -f bin/$DLLNAME ] && DLLDIR=bin
-
zip $ZIP -@ <<EOF
-$DLLDIR/$DLLNAME
+bin/$DLLNAME
EOF
rm $DEVZIP
@@ -30,12 +27,10 @@ lib/librsvg-2.dll.a
lib/pkgconfig/librsvg-2.0.pc
EOF
+gtk_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+
rm $ENGINEZIP
-zip $ENGINEZIP -@ <<EOF
-lib/gtk-2.0/2.4.0/engines/libsvg.dll
-EOF
+zip $ENGINEZIP lib/gtk-2.0/${gtk_binary_version}/engines/libsvg.dll
rm $LOADERZIP
-zip $LOADERZIP -@ <<EOF
-lib/gtk-2.0/2.4.0/loaders/svg_loader.dll
-EOF
+zip $LOADERZIP lib/gtk-2.0/${gtk_binary_version}/loaders/svg_loader.dll