summaryrefslogtreecommitdiff
path: root/lib/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Makefile.am')
-rw-r--r--lib/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f695c1f0c..9a6be98e4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,7 +40,7 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
if INSTALL_GLIBJ_ZIP
-pkgdata_DATA = glibj.zip
+glibj_DATA = glibj.zip
endif # INSTALL_GLIBJ_ZIP
@@ -73,7 +73,7 @@ endif # INSTALL_CLASS_FILES
glibj.zip: classes compile-classes resources
if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
-resources:
+resources: copy-vmresources.sh
if ! [ -e gnu ]; then mkdir gnu; fi
if ! [ -e gnu/java ]; then mkdir gnu/java; fi
if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi
@@ -87,6 +87,7 @@ resources:
@list='$(metafiles)'; for p in $$list; do \
cp $(top_srcdir)/resource/$$p $$p; \
done
+ @$(SHELL) ./copy-vmresources.sh
@list='$(iconfiles)'; for p in $$list; do \
cp $(top_srcdir)/$$p $$p; \
done
@@ -145,6 +146,7 @@ clean-local:
-rm -rf java
-rm -rf javax
-rm -rf org
+ -rm -rf com
-rm -rf META-INF
-rm -rf lists
-rm -f Makefile.deps