diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-13 10:30:18 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-13 10:30:18 +0000 |
| commit | 4c92d332ecd0ce09797c504ec46acc0486e97928 (patch) | |
| tree | 67e44b1be1f8e23b3fe34dd11b43fa5bb8646b8d | |
| parent | efa383427250b29104692171947badc18b5a44d0 (diff) | |
| download | buildsystem-4c92d332ecd0ce09797c504ec46acc0486e97928.tar.gz buildsystem-4c92d332ecd0ce09797c504ec46acc0486e97928.tar.bz2 | |
Include $(PREFIX)/lib/pkgconfig in the pkg-config search path
svn path=/trunk/tools/buildsystem/; revision=12012
| -rw-r--r-- | makefiles/Makefile.tools | 15 | ||||
| -rw-r--r-- | makefiles/Makefile.top | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index f3fb9db..23b2426 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -17,6 +17,8 @@ # OPTCXXFLAGS Optional C++ compiler flags for $(BUILD) # OPTLDFLAGS Optional linker flags for $(BUILD) # TARGET Target platform (defaults to host) +# PREFIX Absolute installation path prefix +# (defaults to /usr/local) # ############################################################################### @@ -142,7 +144,7 @@ ifeq ($(TARGET),riscos) CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)" $(GCCSDK_INSTALL_CROSSBIN)/cmunge GENHTML ?= echo LCOV ?= echo - PKGCONFIG ?= $(GCCSDK_INSTALL_ENV)/ro-pkg-config + PKGCONFIG ?= PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig" pkg-config ifneq ($(COMPONENT_TYPE),riscos-module) ifeq ($(origin CC),default) @@ -200,7 +202,7 @@ ifeq ($(TARGET),beos) CXX__ := $(wildcard $(BEOS_INSTALL_CROSSBIN)/*g++) AR__ := $(wildcard $(BEOS_INSTALL_CROSSBIN)/*ar) - PKGCONFIG := PKG_CONFIG_LIBDIR="$(BEOS_INSTALL_ENV)/lib/pkgconfig:$(BEOS_INSTALL_ENV)/share/pkgconfig" pkg-config + PKGCONFIG := PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(BEOS_INSTALL_ENV)/lib/pkgconfig:$(BEOS_INSTALL_ENV)/share/pkgconfig" pkg-config endif endif @@ -229,7 +231,7 @@ ifeq ($(TARGET),windows) CXX__ := i586-mingw32msvc-g++ AR__ := i586-mingw32msvc-ar - PKGCONFIG ?= PKG_CONFIG_LIBDIR="$(MINGW_INSTALL_ENV)/lib/pkgconfig" pkg-config + PKGCONFIG ?= PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/share/pkgconfig" pkg-config endif # TODO: this assumes GCC @@ -261,7 +263,7 @@ ifeq ($(findstring amiga,$(TARGET)),amiga) CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) CXX__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) - PKGCONFIG ?= PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config + PKGCONFIG ?= PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/share/pkgconfig" pkg-config # TODO: this assumes GCC CFLAGS := $(CFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/include @@ -272,6 +274,9 @@ ifeq ($(findstring amiga,$(TARGET)),amiga) endif endif +# Default prefix +PREFIX ?= /usr/local + ############################################################################### # Tool defaults ############################################################################### @@ -309,7 +314,7 @@ MV ?= mv PERL ?= perl -PKGCONFIG ?= pkg-config +PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig" pkg-config GREP ?= grep diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index a4ef4ec..99651fc 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -23,8 +23,6 @@ # Set to "yes" if it can. # DESTDIR Sandboxed FS root (e.g. for packaging) # HOST Host platform identifier -# PREFIX Absolute installation path prefix -# (defaults to /usr/local) # REQUIRED_PKGS List of required pkg-config packages # # The client may also override all toolchain settings, including: @@ -116,9 +114,6 @@ BUILDDIR ?= build-$(HOST)-$(TARGET)-$(BUILD)-$(COMPONENT_TYPE) COVERAGEDIR := $(BUILDDIR)/coverage DOCDIR := $(BUILDDIR)/docs -# Default prefix -PREFIX ?= /usr/local - # Determine if we want to build testcases ifeq ($(MAKECMDGOALS),test) WANT_TEST := yes |