summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:15:59 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2012-06-29 19:15:59 +0000
commit0a228128dcdbec7bc339d024d50484a885e19872 (patch)
tree96375f3e3abb0a6dcaee6d0014ee973619191933
parente1b884b03ec0f2f2daf5602133b05e61b3c63d2f (diff)
downloadttf2f-0a228128dcdbec7bc339d024d50484a885e19872.tar.gz
ttf2f-0a228128dcdbec7bc339d024d50484a885e19872.tar.bz2
Rework the makefiles in the tools/ tree for the new NSBUILD stuff
svn path=/trunk/tools/ttf2f/; revision=13998
-rw-r--r--Makefile6
-rw-r--r--src/Makefile2
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 728e5fb..dd8431e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,9 @@ COMPONENT_TYPE := binary
FRONTEND ?= cli
# Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
@@ -41,7 +43,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
endif
endif
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
# Extra installation rules
diff --git a/src/Makefile b/src/Makefile
index d331193..251a32c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,4 +9,4 @@ else
endif
endif
-include build/makefiles/Makefile.subdir
+include $(NSBUILD)/Makefile.subdir