From 573e8a1cd233066d864f0c0597df9e9cb689fae4 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 27 Aug 2009 05:24:43 +0000 Subject: 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. --- bfd/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bfd/Makefile.am') 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@ -- cgit v1.1