summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-08-04 23:28:05 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-05-02 14:41:33 +0100
commit5670b68b4187ac15a44390eb37f6bbb2681a0d8e (patch)
tree3d8196967b05c7b78d511996e360ecbfb8fb2a23
parent189060b2e76c229f9d60c805eb676919ed8868a9 (diff)
jhbuild build helper Makefile
Also add tinderbox install root to include and library paths Also ensure $(DESTDIR)/$(prefix) directory exists after install, otherwise jhbuild complains Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-rw-r--r--Makefile11
-rw-r--r--make/common.mak4
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..79eded3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+all:
+ export GLEAN_ROOT=`pwd` ; cd src ; $(MAKE) $(MAKEFLAGS) install
+
+install:
+ mkdir -p $(DESTDIR)/jhbuild/install
+ touch $(DESTDIR)/jhbuild/install/.keep
+
+check:
+
+clean:
+ export GLEAN_ROOT=`pwd` ; cd src ; $(MAKE) $(MAKEFLAGS) clean
diff --git a/make/common.mak b/make/common.mak
index e2cb0a1..655a1e8 100644
--- a/make/common.mak
+++ b/make/common.mak
@@ -72,8 +72,8 @@ endif # MacOSX
ifeq ($(PLATFORM), Unix)
# Note: Do *not* list standard system #include directories here,
# because some compilers complain about them.
- XINC:=-I/usr/include/X11
- XLIB:=/usr/X11R6/lib
+ XINC:=-I/usr/include/X11 -I/jhbuild/install/include/X11
+ XLIB:=/jhbuild/install/lib
GLINC:=#-I/usr/include
GLLIB:=/usr/lib
GLUTINC:=#-I/usr/include