Makefile.am (install-data-local): Correct symlink paths for SDK-style installed JARs.

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.

From-SVN: r141499

3 files changed, 28 insertions, 26 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d6687af..b5f9248 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2008-10-23  David Edelsohn  <edelsohn@gnu.org>
 
 	PR target/35485
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 82cc63e..0132db3 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -612,11 +612,15 @@ if CREATE_JAVA_HOME
 	version=$(JAVA_VERSION).$(BUILD_VERSION); \
 	working_dir=`pwd`; \
 	cd $(DESTDIR)$(JVM_JAR_DIR); \
+	  RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
+	    $(DESTDIR)$(JVM_JAR_DIR)); \
 	  for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
 	    jndi-ldap jndi-rmi jsse sasl; \
 	  do \
-	    ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
+	    ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
 	  done; \
+	  RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+	    $(DESTDIR)$(JVM_JAR_DIR)); \
 	  for jar in *-$$version.jar; \
 	  do \
 	    ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
@@ -633,14 +637,7 @@ if CREATE_JAVA_HOME
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
 	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
-	cd $(DESTDIR)$(JRE_LIB_DIR); \
-	  for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
-	    jndi-ldap jndi-rmi jsse sasl; \
-	  do \
-	    ln -s rt.jar $$jarname.jar; \
-	  done; \
-	cd $$working_dir; \
-	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 	  $(DESTDIR)$(JRE_LIB_DIR)); \
 	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
 	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
@@ -656,14 +653,14 @@ if CREATE_JAVA_HOME
 	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
 	ln -sf $$RELATIVE/libjvm.so \
 	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
-	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 	  $(DESTDIR)$(SDK_LIB_DIR)); \
 	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
 	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
 	for headername in jawt jni; do \
 	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
 	    -print-file-name=include/$$headername.h)); \
-	  RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+	  RELATIVE=$$(relative $$DIRECTORY \
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)); \
 	  ln -sf $$RELATIVE/$$headername.h \
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
@@ -671,12 +668,12 @@ if CREATE_JAVA_HOME
 	for headername in jawt_md jni_md; do \
 	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
 	    -print-file-name=include/$$headername.h)); \
-	  RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+	  RELATIVE=$$(relative $$DIRECTORY \
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
 	  ln -sf $$RELATIVE/$$headername.h \
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 	done; \
-	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
 	ln -sf $$RELATIVE/src-$(gcc_version).zip \
 	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index a803fed..064cdfc 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -12382,6 +12382,7 @@ 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; \
@@ -12433,11 +12434,15 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	version=$(JAVA_VERSION).$(BUILD_VERSION); \
 @CREATE_JAVA_HOME_TRUE@	working_dir=`pwd`; \
 @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JVM_JAR_DIR); \
+@CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
+@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(JVM_JAR_DIR)); \
 @CREATE_JAVA_HOME_TRUE@	  for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
 @CREATE_JAVA_HOME_TRUE@	    jndi-ldap jndi-rmi jsse sasl; \
 @CREATE_JAVA_HOME_TRUE@	  do \
-@CREATE_JAVA_HOME_TRUE@	    ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
+@CREATE_JAVA_HOME_TRUE@	    ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
 @CREATE_JAVA_HOME_TRUE@	  done; \
+@CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(JVM_JAR_DIR)); \
 @CREATE_JAVA_HOME_TRUE@	  for jar in *-$$version.jar; \
 @CREATE_JAVA_HOME_TRUE@	  do \
 @CREATE_JAVA_HOME_TRUE@	    ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
@@ -12454,14 +12459,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
 @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
 @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
-@CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR); \
-@CREATE_JAVA_HOME_TRUE@	  for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
-@CREATE_JAVA_HOME_TRUE@	    jndi-ldap jndi-rmi jsse sasl; \
-@CREATE_JAVA_HOME_TRUE@	  do \
-@CREATE_JAVA_HOME_TRUE@	    ln -s rt.jar $$jarname.jar; \
-@CREATE_JAVA_HOME_TRUE@	  done; \
-@CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)); \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
@@ -12477,14 +12475,15 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libjvm.so \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)); \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
 @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@	  RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+@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 \
 @CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
@@ -12492,12 +12491,12 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	for headername in jawt_md jni_md; do \
 @CREATE_JAVA_HOME_TRUE@	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
 @CREATE_JAVA_HOME_TRUE@	    -print-file-name=include/$$headername.h)); \
-@CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+@CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
 @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/$$headername.h \
 @CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@	done; \
-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/src-$(gcc_version).zip \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;