diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 21abeb19a2f..c8bab011186 100644 --- 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 c4746bfd854..7db8a444a5f 100644 --- 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 4de0b3142c0..b9e38dfb8bc 100644 --- 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); \ |