From f4320d1b1ab7602c66fa8740f0d564a6ae40e837 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 29 Jun 2012 18:24:26 +0000 Subject: Allow Makefile.tools to find the test tools etc, and use NSSHARED as the root of everything svn path=/trunk/tools/buildsystem/; revision=13997 --- example/Makefile | 4 +++- makefiles/Makefile.tools | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/example/Makefile b/example/Makefile index 582fb69..1591aa8 100644 --- a/example/Makefile +++ b/example/Makefile @@ -6,7 +6,9 @@ COMPONENT_TYPE := lib-static COMPONENT_VERSION := 0.0.1 # Tooling -include build/makefiles/Makefile.tools +PREFIX ?= /opt/netsurf +NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem +include $(NSSHARED)/makefiles/Makefile.tools # Grab the core makefile include $(NSBUILD)/Makefile.top diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 922e690..231181b 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -35,10 +35,12 @@ ifeq ($(BUILD),) endif ############################################################################### -# Determine path used to load us, so we can locate other makefiles +# Determine path used to load us, so we can locate other makefiles etc ############################################################################### NSBUILD := $(dir $(lastword $(MAKEFILE_LIST))) +NSSHARED := $(dir $(NSBUILD)) +NSTESTTOOLS := $(NSSHARED)/testtools ############################################################################### # Host/target platform detection -- cgit v1.2.3