Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/glib/ChangeLog,v
retrieving revision 1.1572
diff -u -p -r1.1572 ChangeLog
--- ChangeLog	4 May 2004 20:13:47 -0000	1.1572
+++ ChangeLog	6 May 2004 04:19:41 -0000
@@ -1,3 +1,10 @@
+2004-05-06  James Henstridge  <james@warabi.daa.com.au>
+
+	* glib-gettextize.in: modify so that mkinstalldirs will get
+	installed into auxdir.
+
+	* Makefile.am (gettext_SCRIPTS): install mkinstalldirs.
+
 2004-05-03  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
 	* configure.in: Added Walloon (wa) to ALL_LINGUAS
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/Makefile.am,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile.am
--- Makefile.am	6 Mar 2004 07:37:38 -0000	1.105
+++ Makefile.am	6 May 2004 04:19:41 -0000
@@ -70,6 +70,10 @@ pkgconfig_DATA = glib-2.0.pc gobject-2.0
 
 $(pkgconfig_DATA): config.status
 
+# install mkinstalldirs for glib-gettextize's benefit
+gettextdir = $(datadir)/glib-2.0/gettext
+gettext_SCRIPTS = mkinstalldirs
+
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
Index: glib-gettextize.in
===================================================================
RCS file: /cvs/gnome/glib/glib-gettextize.in,v
retrieving revision 1.3
diff -u -p -r1.3 glib-gettextize.in
--- glib-gettextize.in	30 May 2003 21:25:38 -0000	1.3
+++ glib-gettextize.in	6 May 2004 04:19:41 -0000
@@ -98,6 +98,20 @@ test -f configure.in || test -f configur
   exit 1
 }
 
+configure_in=NONE
+if test -f configure.in; then
+  configure_in=configure.in
+else
+  if test -f configure.ac; then
+    configure_in=configure.ac
+  fi
+fi
+# Check in which directory config.rpath, mkinstalldirs etc. belong.
+auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
+if test -n "$auxdir"; then
+  auxdir="$auxdir/"
+fi
+
 if test -f po/Makefile.in.in && test $force -eq 0; then
   $echo "\
 po/Makefile.in.in exists: use option -f if you really want to delete it."
@@ -122,6 +136,11 @@ cd $gettext_dir || {
 for file in *; do
   case $file in
     intl | po)
+      ;;
+    mkinstalldirs)
+      rm -f "$srcdir/$auxdir$file"
+      ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$auxdir$file" && $echo "Symlinking file $file") 2>/dev/null ||
+      { $echo "Copying file $file"; cp $file "$srcdir/$auxdir$file"; }
       ;;
     *)
       rm -f "$srcdir/$file"
