diff options
| author | Andreas Tobler <a.tobler@schweiz.org> | 2008-02-06 20:45:21 +0000 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2008-02-06 21:45:21 +0100 |
| commit | c64ccf4d248e2aebfa8fe021b31277d1be2fb3c7 (patch) | |
| tree | 25b759630aeb51c65eb6f5005eced698a6aca575 /libjava | |
| parent | 04941f7657cd5e392e3b9e3bf217a5696ecde77a (diff) | |
| download | gcc-c64ccf4d248e2aebfa8fe021b31277d1be2fb3c7.zip gcc-c64ccf4d248e2aebfa8fe021b31277d1be2fb3c7.tar.gz gcc-c64ccf4d248e2aebfa8fe021b31277d1be2fb3c7.tar.bz2 | |
re PR libgcj/30071 (make install fails for libjava)
2008-02-06 Andreas Tobler <a.tobler@schweiz.org>
PR libgcj/30071
* Makefile.am (install-exec-hook): Add install-binPROGRAMS.
* Makefile.in: Regenerate.
From-SVN: r132159
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/Makefile.in | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d3336d6..09a7aa7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2008-02-06 Andreas Tobler <a.tobler@schweiz.org> + + PR libgcj/30071 + * Makefile.am (install-exec-hook): Add install-binPROGRAMS. + * Makefile.in: Regenerate. + 2008-01-24 David Edelsohn <edelsohn@gnu.org> * shlibpath.m4: Add AIX 6 support. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 51e4761..d840782 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -453,7 +453,8 @@ extra_headers = java/lang/Object.h java/lang/Class.h $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: -install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS +install-exec-hook: install-binPROGRAMS 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 diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 37446b3..6003de5 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -11869,7 +11869,8 @@ gcjh.stamp: classpath/lib/compile-classes $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: -install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS +install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \ + install-libexecsubPROGRAMS @USE_LIBGCJ_BC_TRUE@ @echo Installing dummy lib libgcj_bc.so.1.0.0; \ @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; \ |