Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/intltool/ChangeLog,v
retrieving revision 1.480
diff -u -p -r1.480 ChangeLog
--- ChangeLog	29 Jul 2005 02:49:24 -0000	1.480
+++ ChangeLog	29 Jul 2005 03:15:49 -0000
@@ -1,3 +1,9 @@
+2005-07-28  Stepan Kasal  <kasal@ucw.cz>
+
+	* intltool.m4 (IT_PROG_INTLTOOL): Don't compute mkdir_p, it's no
+	longer used in Makefile.in.in.
+	* Makefile.in.in: Remove the line "mkdir_p = @mkdir_p@".
+
 2005-07-28  Rodney Dawes  <dobey@novell.com>
 
 	* doc/intltool-merge.8: Fix a typo s/seperated/separated/
Index: Makefile.in.in
===================================================================
RCS file: /cvs/gnome/intltool/Makefile.in.in,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.in.in
--- Makefile.in.in	21 Jul 2005 12:02:18 -0000	1.9
+++ Makefile.in.in	29 Jul 2005 03:15:49 -0000
@@ -38,7 +38,6 @@ gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
 install_sh = @install_sh@
-mkdir_p = @mkdir_p@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 INSTALL = @INSTALL@
Index: intltool.m4
===================================================================
RCS file: /cvs/gnome/intltool/intltool.m4,v
retrieving revision 1.83
diff -u -p -r1.83 intltool.m4
--- intltool.m4	21 Jul 2005 12:02:55 -0000	1.83
+++ intltool.m4	29 Jul 2005 03:15:49 -0000
@@ -129,35 +129,6 @@ ifdef([AC_DIVERSION_ICMDS],[
        ]dnl
     ])
   ])
-
-############################################################################
-## Take this bit from AM_PROG_MKDIR_P to set mkdir_p for automake 1.4 users
-############################################################################
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])
 ])
 
 # Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
