e2756cb835
- Fix conflicts with java/classpath. Note security provider configuration is moved to ${PREFIX}/lib/security/SableVM.security. This file is always loaded first because the short vendor name is SableVM. If it does not exist, then classpath.security is loaded (java/security/Security.java). - Reduce Makefile headers, add licenses, and convert to optionsNG.
11 lines
848 B
Text
11 lines
848 B
Text
--- lib/Makefile.in.orig 2012-03-08 18:54:14.000000000 -0500
|
|
+++ lib/Makefile.in 2012-10-03 18:17:34.000000000 -0400
|
|
@@ -316,7 +316,7 @@
|
|
@INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip $(COLLECTIONS)
|
|
@BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources
|
|
@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_FALSE@CREATE_GLIBJ_ZIP = $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null
|
|
-@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i glibj.zip
|
|
+@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i $(builddir)/glibj.zip
|
|
#endif
|
|
EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh glibj.zip
|
|
CLEANFILES = compile-classes resources classes \
|