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.am | |
| parent | 2efab443eb62bbb0fb1e6a4ed0449460199c321a (diff) | |
| download | fsf-binutils-gdb-573e8a1cd233066d864f0c0597df9e9cb689fae4.zip fsf-binutils-gdb-573e8a1cd233066d864f0c0597df9e9cb689fae4.tar.gz fsf-binutils-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.am')
| -rw-r--r-- | opcodes/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 465ea05..4f9a390 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -17,16 +17,19 @@ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \ $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ -bfdlibdir = @bfdlibdir@ -bfdincludedir = @bfdincludedir@ - libopcodes_la_LDFLAGS = if INSTALL_LIBBFD +bfdlibdir = @bfdlibdir@ +bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libopcodes.la bfdinclude_DATA = $(INCDIR)/dis-asm.h else +# Empty these so that the respective installation directories will not be created. +bfdlibdir = +bfdincludedir = +rpath_bfdlibdir = @bfdlibdir@ noinst_LTLIBRARIES = libopcodes.la -libopcodes_la_LDFLAGS += -rpath $(bfdlibdir) +libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. |