This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[libjava patch] support DESTDIR in install-exec-hook
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: java-patches at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Wed, 10 Jan 2007 15:31:37 +0100
- Subject: [libjava patch] support DESTDIR in install-exec-hook
That change seems to be lost in the ecj merge; committed as obvious.
Matthias
2007-01-10 Matthias Klose <doko@debian.org>
* Makefile.am (install-exec-hook): Support $(DESTDIR).
* Makefile.in: Regenerated.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 120635)
+++ Makefile.am (working copy)
@@ -434,13 +434,13 @@
## libtool's .la file, this prevents libtool resetting the lib again
## later.
@echo Installing dummy lib libgcj_bc.so.1.0.0; \
- rm $(toolexeclibdir)/libgcj_bc.so; \
- mv $(toolexeclibdir)/libgcj_bc.so.1.0.0 $(toolexeclibdir)/libgcj_bc.so; \
+ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+ mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
$(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
- -o $(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
- rm $(toolexeclibdir)/libgcj_bc.so.1; \
- $(LN_S) libgcj_bc.so.1.0.0 $(toolexeclibdir)/libgcj_bc.so.1; \
- rm $(toolexeclibdir)/libgcj_bc.la;
+ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+ $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
endif
if BUILD_ECJ1
if NATIVE