OSDN Git Service

2009-04-23 Matthias Klose <doko@ubuntu.com>
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 23 Apr 2009 10:37:50 +0000 (10:37 +0000)
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 23 Apr 2009 10:37:50 +0000 (10:37 +0000)
        * Makefile.am (install-data-local): Fix symlinks to header files.
        * Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146640 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in

index 21abeb1..c8bab01 100644 (file)
@@ -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
index c4746bf..7db8a44 100644 (file)
@@ -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); \
index 4de0b31..b9e38df 100644 (file)
@@ -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); \