Makefile.am (install-data-local): Fix symlinks to header files.

2009-04-23  Matthias Klose  <doko@ubuntu.com>

        * Makefile.am (install-data-local): Fix symlinks to header files.
        * Makefile.in: Regenerate.

From-SVN: r146640

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 21abeb19a2f564bb6d195acf0e02414b6691863f..c8bab0111861f4f82b89e3b82439efb26c6d83da 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23  Matthias Klose  <doko@ubuntu.com>
+
+       * Makefile.am (install-data-local): Fix symlinks to header files.
+       * Makefile.in: Regenerate.
+
 2009-04-23  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * gnu/classpath/jdwp/natVMVirtualMachine.cc (handle_single_step):  Use

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index c4746bfd854faa4d37be7c3dfd5ac1812aaec440..7db8a444a5fe48c8e04821ffea3fe11d8198241c 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -667,7 +667,7 @@ if CREATE_JAVA_HOME
        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 \
+         DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
            -print-file-name=include/$$headername.h)); \
          RELATIVE=$$(relative $$DIRECTORY \
            $(DESTDIR)$(SDK_INCLUDE_DIR)); \
@@ -675,7 +675,7 @@ if CREATE_JAVA_HOME
            $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
        done; \
        for headername in jawt_md jni_md; do \
-         DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
+         DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
            -print-file-name=include/$$headername.h)); \
          RELATIVE=$$(relative $$DIRECTORY \
            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 4de0b3142c093acf6e6341160319308ed7f0bc8c..b9e38dfb8bc390d81cce8977f2e77bee6b66b50d 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -12514,7 +12514,7 @@ install-data-local:
 @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@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
 @CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)); \
@@ -12522,7 +12522,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@        done; \
 @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@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
 @CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \