summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-11-26 22:45:37 +0000
committerMark Wielaard <mark@klomp.org>2006-11-26 22:45:37 +0000
commit2e60c42a8c0dcae616df9a070f48c42389f0f164 (patch)
treeb31d22128cd17cf5a395064e6ffd1c3c3653a439 /lib
parent9e283236c20855f032bc7bc1254d642091aec716 (diff)
downloadclasspath-2e60c42a8c0dcae616df9a070f48c42389f0f164.tar.gz
* gnu/java/net/PlainSocketImpl.java (accept): Reset timeout on Socket.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8b93f8122..ee866eb74 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