summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2010-04-23 07:38:36 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2010-04-23 07:38:36 +0000
commitec56ec7920e69fd59b3e7f535435b7af85313ca3 (patch)
tree37424177a6ee0ac6c1fc1fdc61ecf7b77e1e0860
parent0c5a964e63f31c989943b9bbe461561bba4414f2 (diff)
Use INSTALL so people on Solaris can set it to ginstall.
-rw-r--r--GNUmakefile9
-rw-r--r--Makefile9
2 files changed, 10 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 5345dbb1..873e3a4f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.124 2010-04-21 21:22:06 nicm Exp $
+# $Id: GNUmakefile,v 1.125 2010-04-23 07:38:36 nicm Exp $
#
# Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
#
@@ -52,9 +52,10 @@ endif
endif
PREFIX?= /usr/local
-INSTALLDIR= install -d
-INSTALLBIN= install -m 555
-INSTALLMAN= install -m 444
+INSTALL?= install
+INSTALLDIR= $(INSTALL) -d
+INSTALLBIN= $(INSTALL) -m 555
+INSTALLMAN= $(INSTALL) -m 444
SRCS= $(shell echo *.c|sed 's|osdep-[a-z0-9]*.c||g')
include config.mk
diff --git a/Makefile b/Makefile
index ba36e2fc..1c25d8ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.157 2010-04-21 21:22:06 nicm Exp $
+# $Id: Makefile,v 1.158 2010-04-23 07:38:36 nicm Exp $
#
# Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
#
@@ -48,9 +48,10 @@ CFLAGS+= -Wno-pointer-sign
.endif
PREFIX?= /usr/local
-INSTALLDIR= install -d
-INSTALLBIN= install -m 555
-INSTALLMAN= install -m 444
+INSTALL?= install
+INSTALLDIR= ${INSTALL} -d
+INSTALLBIN= ${INSTALL} -m 555
+INSTALLMAN= ${INSTALL} -m 444
SRCS!= echo *.c|sed 's|osdep-[a-z0-9]*.c||g'
.include "config.mk"