diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-13 09:16:38 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-13 09:16:38 +0000 |
| commit | f0bc4109112dd7f1663eef3ec6271eda0250d9ee (patch) | |
| tree | 9e192150dc27f779f40e00b515c78c3b0fb492d0 /lib | |
| parent | 729e1e497a1cb68477209bba3cd30d67c2837b4c (diff) | |
| download | classpath-f0bc4109112dd7f1663eef3ec6271eda0250d9ee.tar.gz | |
2008-06-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add --enable-gjdoc option and check
for mkdir -p.
* examples/Makefile.am,
* lib/Makefile.am,
* lib/copy-vmresources.sh.in:
Use @MKDIR_P@.
* tools/Makefile.am:
Allow building GJDoc to be disabled
and use @MKDIR_P@.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 10 | ||||
| -rw-r--r-- | lib/copy-vmresources.sh.in | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 24561e806..872384905 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 \*\.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/lib/copy-vmresources.sh.in b/lib/copy-vmresources.sh.in index dbda9de20..3d3c41627 100644 --- a/lib/copy-vmresources.sh.in +++ b/lib/copy-vmresources.sh.in @@ -11,7 +11,7 @@ for p in ${vmdirs}; do (cd $p/META-INF; dirs=`find . -name "CVS" -prune -o -type d -print`; for u in ${dirs}; do - mkdir -p ${destMetaDir}/${u}; + @MKDIR_P@ ${destMetaDir}/${u}; done; files=`find . -name "CVS" -prune -o -name "*.in" -prune -o -type f -print`; for u in ${files}; do @@ -31,7 +31,7 @@ for p in ${vmdirs}; do resnewdirs=`echo ${resdirs} | uniq`; for u in ${resnewdirs}; do - mkdir -p ${destResDir}/${u}; + @MKDIR_P@ ${destResDir}/${u}; done for f in ${resfiles}; do |