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.
55 lines
2 KiB
Text
55 lines
2 KiB
Text
--- include/Makefile.in.orig 2007-03-30 02:30:43.000000000 -0400
|
|
+++ include/Makefile.in 2012-09-28 12:17:30.000000000 -0400
|
|
@@ -59,7 +59,7 @@
|
|
*) f=$$p;; \
|
|
esac;
|
|
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
-am__installdirs = "$(DESTDIR)$(includedir)"
|
|
+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
|
|
includeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(include_HEADERS)
|
|
ETAGS = etags
|
|
@@ -271,7 +271,7 @@
|
|
target_os = @target_os@
|
|
target_vendor = @target_vendor@
|
|
vm_classes = @vm_classes@
|
|
-include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h
|
|
+include_HEADERS = jawt.h jawt_md.h
|
|
DISTCLEANFILES = jni_md.h
|
|
ARG_JNI_JAVAH = -jni
|
|
ARG_CLASSPATH_JAVAH = -bootclasspath
|
|
@@ -470,20 +470,20 @@
|
|
uninstall-info-am:
|
|
install-includeHEADERS: $(include_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
|
|
+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
|
|
@list='$(include_HEADERS)'; for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
f=$(am__strip_dir) \
|
|
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
|
|
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
|
|
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
|
|
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
|
|
done
|
|
|
|
uninstall-includeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(include_HEADERS)'; for p in $$list; do \
|
|
f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
|
|
+ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
|
|
+ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -566,7 +566,7 @@
|
|
@CREATE_JNI_HEADERS_FALSE@all-local:
|
|
all-am: Makefile $(HEADERS) config.h all-local
|
|
installdirs:
|
|
- for dir in "$(DESTDIR)$(includedir)"; do \
|
|
+ for dir in "$(DESTDIR)$(pkgincludedir)"; do \
|
|
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
done
|
|
install: install-am
|