2006-08-17 H.J. Lu <hongjiu.lu@intel.com>

	* Makefile.am (install-exec-hook): Support $(DESTDIR).
	* Makefile.in: Regenerated.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 226e493..5cb7bc4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (install-exec-hook): Support $(DESTDIR).
+       * Makefile.in: Regenerated.
+

 2006-08-16  Tom Tromey  <tromey@redhat.com>
 
        * libtool-version: Updated.
 2006-08-16  Tom Tromey  <tromey@redhat.com>
 
        * libtool-version: Updated.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index f04f993..85e6fec 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -543,13 +543,13 @@ if USE_LIBGCJ_BC
 ## later.
 install-exec-hook: install-toolexeclibLTLIBRARIES
        @echo Installing dummy lib libgcj_bc.so.1.0.0; \
 ## later.
 install-exec-hook: install-toolexeclibLTLIBRARIES
        @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 \
        $(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
 
 ## Install the headers.  It is fairly ugly that we have to do this by
 endif
 
 ## Install the headers.  It is fairly ugly that we have to do this by

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 2a6f7d1..ad08b34 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -11774,13 +11774,13 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
 
 @USE_LIBGCJ_BC_TRUE@install-exec-hook: install-toolexeclibLTLIBRARIES
 @USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
 
 @USE_LIBGCJ_BC_TRUE@install-exec-hook: install-toolexeclibLTLIBRARIES
 @USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \

-@USE_LIBGCJ_BC_TRUE@   rm $(toolexeclibdir)/libgcj_bc.so; \
-@USE_LIBGCJ_BC_TRUE@   mv $(toolexeclibdir)/libgcj_bc.so.1.0.0 $(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \

 @USE_LIBGCJ_BC_TRUE@   $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
 @USE_LIBGCJ_BC_TRUE@   $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \

-@USE_LIBGCJ_BC_TRUE@   -o $(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
-@USE_LIBGCJ_BC_TRUE@   rm $(toolexeclibdir)/libgcj_bc.so.1; \
-@USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(toolexeclibdir)/libgcj_bc.so.1; \
-@USE_LIBGCJ_BC_TRUE@   rm $(toolexeclibdir)/libgcj_bc.la;
+@USE_LIBGCJ_BC_TRUE@   -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+@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;

 
 install-data-local:
        $(PRE_INSTALL)
 
 install-data-local:
        $(PRE_INSTALL)