diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-08-27 05:24:43 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-08-27 05:24:43 +0000 |
| commit | 573e8a1cd233066d864f0c0597df9e9cb689fae4 (patch) | |
| tree | 862108a7be6dad9f1a7be8eca8030a5d8ffe894e /opcodes/Makefile.in | |
| parent | 2efab443eb62bbb0fb1e6a4ed0449460199c321a (diff) | |
| download | gdb-573e8a1cd233066d864f0c0597df9e9cb689fae4.zip gdb-573e8a1cd233066d864f0c0597df9e9cb689fae4.tar.gz gdb-573e8a1cd233066d864f0c0597df9e9cb689fae4.tar.bz2 | |
Do not create $(bfdlibdir) and $(bfdincludedir) if !INSTALL_LIBBFD.
opcodes/:
* Makefile.am (bfdlibdir, bfdincludedir): Move definition ...
[INSTALL_LIBBFD]: ... here, ...
[INSTALL_LIBBFD]: ... and empty overrides here.
[!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable.
[!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it.
* Makefile.in: Regenerate.
* configure: Regenerate.
bfd/:
* acinclude.m4 (AM_INSTALL_LIBBFD): Call AM_SUBST_NOTMAKE for
bfdlibdir and bfdincludedir.
* Makefile.am (bfdlibdir, bfdincludedir): Move definition ...
[INSTALL_LIBBFD]: ... here, ...
[INSTALL_LIBBFD]: ... and empty overrides here.
[!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable.
[!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it.
* Makefile.in: Regenerate.
* configure: Regenerate.
bfd/doc/:
* Makefile.in: Regenerate.
Diffstat (limited to 'opcodes/Makefile.in')
| -rw-r--r-- | opcodes/Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index b789202..80189ac 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -37,7 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(bfdlibdir) +@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(rpath_bfdlibdir) subdir = . DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -229,8 +229,11 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ archdefs = @archdefs@ -bfdincludedir = @bfdincludedir@ -bfdlibdir = @bfdlibdir@ +@INSTALL_LIBBFD_FALSE@bfdincludedir = +@INSTALL_LIBBFD_TRUE@bfdincludedir = @bfdincludedir@ +# Empty these so that the respective installation directories will not be created. +@INSTALL_LIBBFD_FALSE@bfdlibdir = +@INSTALL_LIBBFD_TRUE@bfdlibdir = @bfdlibdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -295,6 +298,7 @@ libopcodes_la_LDFLAGS = $(am__append_1) -release `cat \ ../bfd/libtool-soversion` @SHARED_LDFLAGS@ @INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libopcodes.la @INSTALL_LIBBFD_TRUE@bfdinclude_DATA = $(INCDIR)/dis-asm.h +@INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. |