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: r141608

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 \