[cp-patches] FYI: Use older @mkdir_p@ not @MKDIR_P@

Andrew John Hughes gnu_andrew at member.fsf.org
Thu Jun 26 09:58:03 UTC 2008


This changes @MKDIR_P@ (from newer Autoconfs) to @mkdir_p@ (the
automake version) so that we aren't reliant on newer autotools.

ChangeLog:

2008-06-26  Andrew John Hughes  <gnu_andrew at 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.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.236
diff -u -u -r1.236 configure.ac
--- configure.ac	23 Jun 2008 14:12:22 -0000	1.236
+++ configure.ac	26 Jun 2008 09:55:33 -0000
@@ -348,7 +348,6 @@
 
 AC_PROG_LN_S
 AC_PROG_INSTALL
-AC_PROG_MKDIR_P
 
 dnl -----------------------------------------------------------
 dnl Checks for programs.
Index: examples/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/examples/Makefile.am,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile.am
--- examples/Makefile.am	13 Jun 2008 09:16:41 -0000	1.25
+++ examples/Makefile.am	26 Jun 2008 09:55:34 -0000
@@ -85,9 +85,9 @@
 # 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; \
Index: lib/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.146
diff -u -u -r1.146 Makefile.am
--- lib/Makefile.am	23 Jun 2008 14:12:22 -0000	1.146
+++ lib/Makefile.am	26 Jun 2008 09:55:42 -0000
@@ -77,18 +77,18 @@
 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 @@
 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 @@
 	-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
Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.50
diff -u -u -r1.50 Makefile.am
--- tools/Makefile.am	13 Jun 2008 09:16:41 -0000	1.50
+++ tools/Makefile.am	26 Jun 2008 09:55:44 -0000
@@ -303,10 +303,10 @@
 # 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 @@
 	       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 @@
 ## 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 


More information about the Classpath-patches mailing list