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 | af9066608914047b60c7bf9a0e7b5d3aacddba55 (patch) | |
tree | fb941c619d2ac41aa9a5b87ac4864cc9968b8399 /opcodes | |
parent | 5e4503e68e13eca6b2488c8914e106bb30c3c45d (diff) | |
download | binutils-redhat-af9066608914047b60c7bf9a0e7b5d3aacddba55.tar.gz |
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')
-rw-r--r-- | opcodes/ChangeLog | 10 | ||||
-rw-r--r-- | opcodes/Makefile.am | 11 | ||||
-rw-r--r-- | opcodes/Makefile.in | 10 | ||||
-rwxr-xr-x | opcodes/configure | 2 |
4 files changed, 26 insertions, 7 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a6ceacd568..9f418b7af6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,13 @@ +2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * 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. + 2009-08-26 Philippe De Muyter <phdm@macqel.be> * m68k-dis.c (print_insn_arg): Add movecr register names for diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 465ea05b79..4f9a3909fe 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. diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index b7892028bd..80189acb74 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. diff --git a/opcodes/configure b/opcodes/configure index 860df278bd..ec7d164d77 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -11521,6 +11521,8 @@ fi + + # host-specific stuff: ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN" |