This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] wrong symlinks for header files when configured with --program-suffix
- From: Matthias Klose <doko at ubuntu dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Thu, 23 Apr 2009 12:31:35 +0200
- Subject: [patch] wrong symlinks for header files when configured with --program-suffix
Don't use gcj, but run it through transform, as done in the same target in all
other places. Checking in this as obvious on the trunk and the branch.
Matthias
2009-04-23 Matthias Klose <doko@ubuntu.com>
* Makefile.am (install-data-local): Fix symlinks to header files.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 146550)
+++ Makefile.am (working copy)
@@ -667,7 +667,7 @@
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 @@
$(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); \