aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog12
-rw-r--r--bfd/Makefile.am10
-rw-r--r--bfd/Makefile.in10
-rw-r--r--bfd/acinclude.m42
-rwxr-xr-xbfd/configure2
-rw-r--r--bfd/doc/ChangeLog4
-rw-r--r--bfd/doc/Makefile.in2
-rw-r--r--opcodes/ChangeLog10
-rw-r--r--opcodes/Makefile.am11
-rw-r--r--opcodes/Makefile.in10
-rwxr-xr-xopcodes/configure2
11 files changed, 60 insertions, 15 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3e8634f..9d165ae 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * 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.
+
2009-08-26 Maxim Kuvyrkov <maxim@codesourcery.com>
* elf32-m68k.c: Rewrite initialization of GOT entries for TLS
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 8381492..f6142dc 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -12,16 +12,20 @@ CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
SUBDIRS = doc po
bfddocdir = doc
-bfdlibdir = @bfdlibdir@
-bfdincludedir = @bfdincludedir@
libbfd_la_LDFLAGS =
if INSTALL_LIBBFD
+bfdlibdir = @bfdlibdir@
+bfdincludedir = @bfdincludedir@
bfdlib_LTLIBRARIES = libbfd.la
bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h
else !INSTALL_LIBBFD
+# Empty these so that the respective installation directories will not be created.
+bfdlibdir =
+bfdincludedir =
+rpath_bfdlibdir = @bfdlibdir@
noinst_LTLIBRARIES = libbfd.la
-libbfd_la_LDFLAGS += -rpath $(bfdlibdir)
+libbfd_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
endif
WARN_CFLAGS = @WARN_CFLAGS@
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index f350990..04e2316 100644
--- a/bfd/Makefile.in
+++ b/bfd/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 = README ChangeLog $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -258,8 +258,11 @@ bfd_default_target_size = @bfd_default_target_size@
bfd_file_ptr = @bfd_file_ptr@
bfd_machines = @bfd_machines@
bfd_ufile_ptr = @bfd_ufile_ptr@
-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@
@@ -323,6 +326,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
@SHARED_LDFLAGS@ $(am__empty)
@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la
@INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h
+@INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4
index cd4fd55..aaa147e 100644
--- a/bfd/acinclude.m4
+++ b/bfd/acinclude.m4
@@ -64,6 +64,8 @@ AC_DEFUN([AM_INSTALL_LIBBFD],
bfdincludedir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/include'
fi
AC_SUBST(bfdlibdir)
+ AM_SUBST_NOTMAKE(bfdlibdir)
AC_SUBST(bfdincludedir)
+ AM_SUBST_NOTMAKE(bfdincludedir)
]
)
diff --git a/bfd/configure b/bfd/configure
index 8c4ce17..034bad2 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -12158,6 +12158,8 @@ fi
+
+
host64=false
target64=false
bfd_default_target_size=32
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 5df2aba..87c9798 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in: Regenerate.
+
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am)
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 526423a..370fcad 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -218,8 +218,6 @@ bfd_default_target_size = @bfd_default_target_size@
bfd_file_ptr = @bfd_file_ptr@
bfd_machines = @bfd_machines@
bfd_ufile_ptr = @bfd_ufile_ptr@
-bfdincludedir = @bfdincludedir@
-bfdlibdir = @bfdlibdir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a6ceacd..9f418b7 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 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.
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.
diff --git a/opcodes/configure b/opcodes/configure
index 860df27..ec7d164 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"
generated by cgit v1.1 at 2024-09-02 15:46:52 +0000