Gitweb links:
...log
http://git.netsurf-browser.org/netsurf-all.git/shortlog/66f962b18bd74324025400a05fdde2b89c9434c0
...commit
http://git.netsurf-browser.org/netsurf-all.git/commit/66f962b18bd74324025400a05fdde2b89c9434c0
...tree
http://git.netsurf-browser.org/netsurf-all.git/tree/66f962b18bd74324025400a05fdde2b89c9434c0
The branch, master has been updated
via 66f962b18bd74324025400a05fdde2b89c9434c0 (commit)
from ab1145b386813a69c7190ea9c8695997badd329e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf-all.git/commit/?id=66f962b18bd74324025400a05fdde2b89c9434c0
commit 66f962b18bd74324025400a05fdde2b89c9434c0
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Fix use of PKG_CONFIG_PATH and CC variable
diff --git a/Makefile b/Makefile
index 849d2e0..11552e9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,12 @@ NSLIB_RO_TARG := librufl libpencil
# Build Environment
export TARGET ?= gtk
TMP_PREFIX := $(CURDIR)/inst-$(TARGET)
-export PKG_CONFIG_PATH = $(TMP_PREFIX)/lib/pkgconfig
+export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
export PATH := $(PATH):$(TMP_PREFIX)/bin/
TMP_NSSHARED := $(CURDIR)/buildsystem
# The system actually doing the build
-BUILD ?= $(shell cc -dumpmachine)
+BUILD ?= $(shell $(CC) -dumpmachine)
# The host we are targetting
HOST ?= $(BUILD)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 849d2e0..11552e9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,12 @@ NSLIB_RO_TARG := librufl libpencil
# Build Environment
export TARGET ?= gtk
TMP_PREFIX := $(CURDIR)/inst-$(TARGET)
-export PKG_CONFIG_PATH = $(TMP_PREFIX)/lib/pkgconfig
+export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
export PATH := $(PATH):$(TMP_PREFIX)/bin/
TMP_NSSHARED := $(CURDIR)/buildsystem
# The system actually doing the build
-BUILD ?= $(shell cc -dumpmachine)
+BUILD ?= $(shell $(CC) -dumpmachine)
# The host we are targetting
HOST ?= $(BUILD)
--
NetSurf 'all' tree. Typically used for releases
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
