Test where the DLLs actually are.

[platform/upstream/glib.git] / glib-zip.in

diff --git a/glib-zip.in b/glib-zip.in
index 50874d9..2e86691 100755 (executable)
--- a/glib-zip.in
+++ b/glib-zip.in
@@ -7,15 +7,18 @@ ZIP=/tmp/glib-@GLIB_VERSION@.zip
 DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
 
 cd @prefix@
-
 rm $ZIP
-zip -r $ZIP -@ <<EOF
+
+DLLDIR=lib
+[ -f bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+
+zip $ZIP -@ <<EOF
 COPYING.LIB-2
 bin/gspawn-win32-helper.exe
-lib/libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
@@ -27,14 +30,18 @@ bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query.exe
 include/glib-2.0
-lib/libglib-1.3.dll.a
-lib/glib-1.3.lib
-lib/libgmodule-1.3.dll.a
-lib/gmodule-1.3.lib
-lib/libgobject-1.3.dll.a
-lib/gobject-1.3.lib
-lib/libgthread-1.3.dll.a
-lib/gthread-1.3.lib
+lib/libglib-2.0.dll.a
+lib/glib-2.0.lib
+lib/glib-2.0.def
+lib/libgmodule-2.0.dll.a
+lib/gmodule-2.0.lib
+lib/gmodule-2.0.def
+lib/libgobject-2.0.dll.a
+lib/gobject-2.0.lib
+lib/gobject-2.0.def
+lib/libgthread-2.0.dll.a
+lib/gthread-2.0.lib
+lib/gthread-2.0.def
 lib/glib-2.0
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
@@ -43,6 +50,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0
+share/gtk-doc/html/glib
+share/gtk-doc/html/gobject
 man/man1/glib-mkenums.1
 man/man1/glib-genmarshal.1
 EOF