summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2008-11-05 13:57:25 +0000
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2008-11-05 13:57:25 +0000
commita92ca656ae5f380ba3ecf95a721639c3550a71ed (patch)
treed2506ebcd9400f660528117a9a1612f8a892891c /libjava
parent2249bf31bcbb1200cf4bd5f0819a886c2c8b23e8 (diff)
downloadppe42-gcc-a92ca656ae5f380ba3ecf95a721639c3550a71ed.tar.gz
ppe42-gcc-a92ca656ae5f380ba3ecf95a721639c3550a71ed.zip
2008-10-31 Andrew Haley <aph@redhat.com>
* Makefile.am (install-data-local): Correct symlink paths for SDK-style installed JARs. Correct symlinks for headers when DESTDIR is set. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141608 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/Makefile.in2
1 files changed, 0 insertions, 2 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 064cdfc5b2e..8678e49e169 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -12382,7 +12382,6 @@ install-data-local:
@CREATE_JAVA_HOME_TRUE@ $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)
@CREATE_JAVA_HOME_TRUE@ $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)
@CREATE_JAVA_HOME_TRUE@ $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
-@CREATE_JAVA_HOME_TRUE@ set -x ;
@CREATE_JAVA_HOME_TRUE@ relative() { \
@CREATE_JAVA_HOME_TRUE@ $(PERL) -e 'use File::Spec; \
@CREATE_JAVA_HOME_TRUE@ print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \
@@ -12482,7 +12481,6 @@ install-data-local:
@CREATE_JAVA_HOME_TRUE@ for headername in jawt jni; do \
@CREATE_JAVA_HOME_TRUE@ DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
@CREATE_JAVA_HOME_TRUE@ -print-file-name=include/$$headername.h)); \
-@CREATE_JAVA_HOME_TRUE@ echo $$DIRECTORY ; \
@CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $$DIRECTORY \
@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_INCLUDE_DIR)); \
@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/$$headername.h \
OpenPOWER on IntegriCloud