diff options
| author | David Tardon <dtardon@redhat.com> | 2014-01-12 09:17:00 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2014-01-13 00:14:27 +0000 |
| commit | 4110cc7c8d38670c79793ea14de37a96887a7688 (patch) | |
| tree | ddb64af5b1cc93b5a1422add79df62b39b0cba56 | |
| parent | 8eaa15250748b78ee1d4a918990b096777eff406 (diff) | |
| download | buildsystem-4110cc7c8d38670c79793ea14de37a96887a7688.tar.gz buildsystem-4110cc7c8d38670c79793ea14de37a96887a7688.tar.bz2 | |
add support for multilibrelease/1.1
Linux distributions typically put 64-bit libraries into /usr/lib64 to
allow coexistence of 32-bit and 64-bit libraries on one system. The
build system should make allowance for this.
Signed-off-by: John-Mark Bell <jmb@netsurf-browser.org>
| -rw-r--r-- | makefiles/Makefile.tools | 5 | ||||
| -rw-r--r-- | makefiles/Makefile.top | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index a7ae724..5b76f23 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -19,6 +19,8 @@ # TARGET Target platform (defaults to host) # PREFIX Absolute installation path prefix # (defaults to /usr/local) +# LIBDIR Library installation directory in ${PREFIX} +# (defaults to lib) # ############################################################################### @@ -368,6 +370,9 @@ endif # Default prefix PREFIX ?= /usr/local +# Default libdir +LIBDIR ?= lib + ############################################################################### # Tool defaults ############################################################################### diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index 031a150..6329c47 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -287,6 +287,7 @@ define install_pkgconfig $(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)" $(Q)$(SED) \ -e 's#PREFIX#$(PREFIX)#' \ + -e 's#LIBDIR#$(LIBDIR)#' \ -e 's#MAJOR#$(major-version)#' \ -e 's#MINOR#$(minor-version)#' \ -e 's#PATCH#$(patch-version)#' \ |