Move from @MKDIR_P@ to @mkdir_p@.

2008-06-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* configure.ac: Remove AC_PROG_MKDIR_P.
	* examples/Makefile.am,
	* lib/Makefile.am,
	* tools/Makefile.am:
	Use mkdir_p instead of MKDIR_P.

5 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f875c4f3..64252ba95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* configure.ac: Remove AC_PROG_MKDIR_P.
+	* examples/Makefile.am,
+	* lib/Makefile.am,
+	* tools/Makefile.am:
+	Use mkdir_p instead of MKDIR_P.
+
 2008-06-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR classpath/36221:
diff --git a/configure.ac b/configure.ac
index d56df53f8..b9eab87e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,6 @@ AM_CONDITIONAL(CREATE_WRAPPERS, test "x${COMPILE_WRAPPERS}" = xyes)
 
 AC_PROG_LN_S
 AC_PROG_INSTALL
-AC_PROG_MKDIR_P
 
 dnl -----------------------------------------------------------
 dnl Checks for programs.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d7befd4ce..a5ad99921 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -85,9 +85,9 @@ dist-hook:
 # class files. Always regenerate all .class files and remove them immediatly.
 # And copy the png icons we use to the classes dir so they get also included.
 $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
-	@MKDIR_P@ classes/gnu/classpath/examples/icons
+	@mkdir_p@ classes/gnu/classpath/examples/icons
 	cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
-	@MKDIR_P@ classes/gnu/classpath/examples/swing
+	@mkdir_p@ classes/gnu/classpath/examples/swing
 	cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
 	$(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) 
 	(cd classes; \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6a95e37d6..888c65965 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -77,18 +77,18 @@ endif # USE_PREBUILT_GLIBJ_ZIP
 resources: copy-vmresources.sh
 	@list=`cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print -o -name \*\.css -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then @MKDIR_P@ "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
 	  cp $(top_srcdir)/resource/$$p $$p; \
 	done
 	@list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then @MKDIR_P@ "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
 	  cp $(top_srcdir)/resource/$$p $$p; \
 	done
 	@$(SHELL) ./copy-vmresources.sh
 	@list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \
           dirname=`dirname $$p`; \
-          if ! test -d "$$dirname"; then @MKDIR_P@ "$$dirname"; fi; \
+          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
 	  cp $(top_srcdir)/$$p $$p; \
 	done
 	touch resources
@@ -96,7 +96,7 @@ resources: copy-vmresources.sh
 classes: genclasses
 
 $(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh 
-	@MKDIR_P@ $(top_builddir)/gnu/java/locale
+	@mkdir_p@ $(top_builddir)/gnu/java/locale
 	$(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java
 
 genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser
@@ -154,7 +154,7 @@ clean-local:
 	-rm -rf lists
 
 dist-hook:
-	@MKDIR_P@ $(distdir)
+	@mkdir_p@ $(distdir)
 	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
 # Delete not wanted files.
 	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dc15be3ff..1a86ce95c 100755
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -303,10 +303,10 @@ dist-hook:
 # so they get also included.
 $(TOOLS_ZIP): $(ALL_TOOLS_FILES)
 	@rm -rf classes asm generated
-	@MKDIR_P@ classes asm 
+	@mkdir_p@ classes asm 
 if CREATE_GJDOC
 ## Generate antlr sources.
-	@MKDIR_P@ generated/gnu/classpath/tools/gjdoc/expr
+	@mkdir_p@ generated/gnu/classpath/tools/gjdoc/expr
 	$(ANTLR) -o generated/gnu/classpath/tools/gjdoc/expr \
 	  $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
 endif
@@ -330,7 +330,7 @@ endif
 	       sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \
 	for p in $$list; do \
 	  dirname=classes/`dirname $$p`; \
-	  if ! test -d "$$dirname"; then @MKDIR_P@ "$$dirname"; fi; \
+	  if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
 	  echo "  cp $(srcdir)/resource/$$p classes/$$p"; \
 	  cp $(srcdir)/resource/$$p classes/$$p; \
 	done
@@ -338,7 +338,7 @@ if CREATE_GJDOC
 ## Copy over gjdoc resource files.
 	for res in $(gjdoc_resources); do \
 	  dir=classes/`dirname $$res`; \
-	  if ! test -d "$$dir"; then @MKDIR_P@ "$$dir"; fi; \
+	  if ! test -d "$$dir"; then @mkdir_p@ "$$dir"; fi; \
 	  echo "  cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res"; \
 	  cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res; \
 	done