From a256763c038714124858954cc3c4fc024191dfdd Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 29 Jun 2012 19:55:35 +0000 Subject: Update to new NSBUILD infrastructure svn path=/trunk/hubbub/; revision=14006 --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 425c0bf..396bd76 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,11 @@ COMPONENT_VERSION := 0.1.2 COMPONENT_TYPE ?= lib-static # Setup the tooling -include build/makefiles/Makefile.tools +PREFIX ?= /opt/netsurf +NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem +include $(NSSHARED)/makefiles/Makefile.tools -TESTRUNNER := $(PERL) build/testtools/testrunner.pl +TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl # Toolchain flags WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ @@ -39,7 +41,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) endif endif -include build/makefiles/Makefile.top +include $(NSBUILD)/Makefile.top ifeq ($(WANT_TEST),yes) # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/ -- cgit v1.2.3