From 419379c9653fdb6c4974a8579d1a8918cc5d7e53 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 2 Jun 2004 19:40:49 +0000
Subject: rjk's `make install' patch.

[originally from svn r4267]
---
 Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 719e9b4..fd6f932 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,11 @@
 #  - the Makefile uses GNU ifdef / ifndef commands and GNU make `%'
 #    pattern rules
 
+prefix=/usr/local
+exec_prefix=$(prefix)
+bindir=$(exec_prefix)/bin
+INSTALL=install -c
+
 ifdef RELEASE
 ifndef VERSION
 VERSION := $(RELEASE)
@@ -35,9 +40,9 @@ BUILDDIR := build
 endif
 endif
 
-all:
+all install:
 	@test -d $(BUILDDIR) || mkdir $(BUILDDIR)
-	@make -C $(BUILDDIR) -f ../Makefile REALBUILD=yes
+	@make -C $(BUILDDIR) -f ../Makefile $@ REALBUILD=yes
 
 spotless: topclean
 	@test -d $(BUILDDIR) || mkdir $(BUILDDIR)
@@ -96,7 +101,7 @@ else
 VDEF = `(cd $(SRC); md5sum -c manifest && cat version)`
 endif
 
-halibut:
+all: halibut
 
 SRC := ../
 
@@ -131,6 +136,10 @@ spotless:: clean
 clean::
 	rm -f *.o halibut core
 
+install:
+	$(INSTALL) -m 755 halibut $(bindir)/halibut
+	$(MAKE) -C ../doc install prefix="$(prefix)" INSTALL="$(INSTALL)"
+
 FORCE: # phony target to force version.o to be rebuilt every time
 
 -include $(DEPS)
-- 
cgit v1.1