2007-01-21 Matthias Klose <doko@debian.org>

        * Makefile.am (install-exec-hook): Use transformed name.
        * Makefile.in: Regenerate.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 74ebbac..2c0a0f7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-21  Matthias Klose  <doko@debian.org>
+
+       * Makefile.am (install-exec-hook): Use transformed name.
+       * Makefile.in: Regenerate.
+
 2007-01-19  Keith Seitz  <keiths@redhat.com>
 
        * gnu/classpath/jdwp/natVMVirtualMachine.cc: Mark unused parameters

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index a89a7f3..eed4f6b 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -447,10 +447,10 @@ if USE_LIBGCJ_BC
 endif
 if BUILD_ECJ1
 if NATIVE
-       mv $(DESTDIR)$(libexecsubdir)/ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+       mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 else !NATIVE
 ## Undo the prepending of the target prefix
-       mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+       mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 endif !NATIVE
 endif BUILD_ECJ1
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e3fac10..37eced9 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -11545,8 +11545,8 @@ install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 @USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
-@BUILD_ECJ1_TRUE@@NATIVE_TRUE@ mv $(DESTDIR)$(libexecsubdir)/ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
-@BUILD_ECJ1_TRUE@@NATIVE_FALSE@        mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+@BUILD_ECJ1_TRUE@@NATIVE_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+@BUILD_ECJ1_TRUE@@NATIVE_FALSE@        mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 
 install-data-local:
        $(PRE_INSTALL)