DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
cd @prefix@
-rm $ZIP
-DLLDIR=lib
-[ -f bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+mkdir -p share/doc/glib-@GLIB_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/glib-@GLIB_VERSION@
+
+mkdir -p share/doc/glib-dev-@GLIB_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@
+
+if test @LIB_EXE_MACHINE_FLAG@ = X64; then
+ helperbits=64
+else
+ helperbits=32
+fi
+rm $ZIP
zip $ZIP -@ <<EOF
-COPYING.LIB-2
-bin/gspawn-win32-helper.exe
-bin/gspawn-win32-helper-console.exe
-$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
+bin/gspawn-win${helperbits}-helper.exe
+bin/gspawn-win${helperbits}-helper-console.exe
+bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
EOF
-zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
+zip $ZIP share/locale/*/LC_MESSAGES/glib20.mo
+
+zip -r -D $ZIP share/doc/glib-@GLIB_VERSION@
rm $DEVZIP
-zip -r $DEVZIP -@ <<EOF
+zip -r -D $DEVZIP -@ <<EOF
bin/glib-genmarshal.exe
bin/glib-gettextize
bin/glib-mkenums
lib/libgthread-2.0.dll.a
lib/gthread-2.0.lib
lib/gthread-2.0.def
+lib/libgio-2.0.dll.a
+lib/gio-2.0.lib
+lib/gio-2.0.def
lib/glib-2.0
lib/pkgconfig/glib-2.0.pc
lib/pkgconfig/gmodule-2.0.pc
lib/pkgconfig/gmodule-no-export-2.0.pc
lib/pkgconfig/gobject-2.0.pc
lib/pkgconfig/gthread-2.0.pc
+lib/pkgconfig/gio-2.0.pc
+lib/pkgconfig/gio-windows-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
+share/gtk-doc/html
+share/man/man1/glib-mkenums.1
+share/man/man1/glib-genmarshal.1
+share/man/man1/gobject-query.1
EOF
+
+zip -r $DEVZIP share/doc/glib-dev-@GLIB_VERSION@