DLLs are always in bin nowadays, no need to test.

2005-09-29  Tor Lillqvist  <tml@novell.com>

	* gtk-zip.sh.in: DLLs are always in bin nowadays, no need to test.

diff --git a/ChangeLog b/ChangeLog
index 84e0de75e0533c8217d948d58619e446f4abf1a2..966b7410f93858d1a0c6fdfade731b0c3b993830 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-29  Tor Lillqvist  <tml@novell.com>
+
+       * gtk-zip.sh.in: DLLs are always in bin nowadays, no need to test.
+
 2005-09-28  Federico Mena Quintero  <federico@ximian.com>
 
        * tests/autotestfilechooser.c (test_reload_sequence): Oops, return

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 84e0de75e0533c8217d948d58619e446f4abf1a2..966b7410f93858d1a0c6fdfade731b0c3b993830 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-09-29  Tor Lillqvist  <tml@novell.com>
+
+       * gtk-zip.sh.in: DLLs are always in bin nowadays, no need to test.
+
 2005-09-28  Federico Mena Quintero  <federico@ximian.com>
 
        * tests/autotestfilechooser.c (test_reload_sequence): Oops, return

diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 211206bd60f2740e7af8fa29f53fe4a7ddf3698b..cd706115da25792d50bfad1fa495a25538d26977 100755 (executable)
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -7,17 +7,14 @@ DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@-`date +%Y%m%d`.zip
 cd @prefix@
 rm $ZIP
 
-DLLDIR=lib
-[ -f bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
-
 zip $ZIP -@ <<EOF
 COPYING.LIB-2
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtkrc
 etc/gtk-2.0/gtk.immodules
-$DLLDIR/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-$DLLDIR/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-$DLLDIR/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/engines/*.dll