This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[ecj]: Patch: FYI: install ecj1 in the correct place
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 05 Dec 2006 16:07:01 -0700
- Subject: [ecj]: Patch: FYI: install ecj1 in the correct place
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcj-eclipse-merge-branch.
We were installing ecj1 in the wrong location.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (libexecsubdir): New variable.
(install-exec-hook): Install ecj1 in libexecsubdir.
(libexecsub_PROGRAMS): Renamed.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 119552)
+++ Makefile.am (working copy)
@@ -29,6 +29,8 @@
# This is required by TL_AC_GXX_INCLUDE_DIR.
libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+
##
## What gets installed, and where.
##
@@ -82,7 +84,7 @@
## We build ecjx and not ecj1 because in one mode, ecjx will not work
## until after 'make install', and we don't want it to be picked up in
## the build tree by gcj via a -B option.
-toolexec_PROGRAMS = ecjx
+libexecsub_PROGRAMS = ecjx
endif
## ################################################################
@@ -423,7 +425,7 @@
$(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
@:
-install-exec-hook: install-toolexeclibLTLIBRARIES install-toolexecPROGRAMS
+install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS
## Support for libgcj_bc: dummy shared library used only at link-time.
if USE_LIBGCJ_BC
## Install libgcj_bc dummy lib in the target directory. We also need to delete
@@ -439,7 +441,7 @@
rm $(toolexeclibdir)/libgcj_bc.la;
endif
if BUILD_ECJ1
- mv $(DESTDIR)$(toolexecdir)/ecjx $(DESTDIR)$(toolexecdir)/ecj1
+ mv $(DESTDIR)$(libexecsubdir)/ecjx $(DESTDIR)$(libexecsubdir)/ecj1
endif
## Install the headers. It is fairly ugly that we have to do this by