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@".

1 files changed, 0 insertions, 29 deletions

diff --git a/intltool.m4 b/intltool.m4
index 5fae356..2d0d2d9 100644
--- a/intltool.m4
+++ b/intltool.m4
@@ -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.