diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-29 22:43:35 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-29 22:43:35 +0000 |
| commit | 3be294e0e9f07e379e1499b9868db9855eb8726f (patch) | |
| tree | a1f67d3f1469ecc142b11c30b1e3c2e1a624794d /lib | |
| parent | f40b961c6c82ebc9ae9863635e5fe19c0b07c116 (diff) | |
| download | classpath-3be294e0e9f07e379e1499b9868db9855eb8726f.tar.gz | |
2006-11-29 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics for 2006/11/12-2006/11/29.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 16 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 52c49186d..0e685902a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,6 @@ JAVA_DEPEND = java.dep ## this file and restart the make process again sinclude $(JAVA_DEPEND) -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) cssfiles := $(shell cd $(top_srcdir) && $(FIND) gnu java javax org -name \*\.css -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print) @@ -104,24 +103,25 @@ glibj.zip: classes compile-classes resources endif # USE_PREBUILT_GLIBJ_ZIP resources: copy-vmresources.sh - if ! test -d gnu; then mkdir gnu; fi - if ! test -d gnu/java; then mkdir gnu/java; fi - if ! test -d gnu/java/locale; then mkdir gnu/java/locale; fi - if ! test -d gnu/javax/swing/plaf/gtk/icons; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi - @list='$(propertydirs)'; for p in $$list; do \ - if ! test -d $$p; then mkdir $$p; fi; \ - done @list='$(propertyfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/resource/$$p $$p; \ done @list='$(cssfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/$$p $$p; \ done @list='$(metafiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/resource/$$p $$p; \ done @$(SHELL) ./copy-vmresources.sh @list='$(iconfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ cp $(top_srcdir)/$$p $$p; \ done touch resources diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index a0d3a075a..ba540cfcc 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -62,7 +62,9 @@ for dir in $vm_dirlist; do done # Only include generated files once. -if test ! "${top_builddir}" -ef "@top_srcdir@"; then +abs_top_builddir=`cd "${top_builddir}"; pwd` +abs_top_srcdir=`cd "@top_srcdir@"; pwd` +if test "$abs_top_builddir" != "$abs_top_srcdir"; then echo "Adding generated files in builddir '${top_builddir}'." # Currently the only generated files are in gnu.*. (cd ${top_builddir}; @FIND@ gnu -follow -name '*.java' -print) | @@ -102,7 +104,7 @@ rm vm.add rm tmp.omit new= -if test -e ${top_builddir}/lib/classes.2; then +if test -f ${top_builddir}/lib/classes.2; then p=`diff ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1` if test "$p" != ""; then new="true" |