summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-07-24 20:08:26 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-07-24 20:08:26 +0000
commit9cc74cdcd0ca0115d241369d7342c7151ea5ef01 (patch)
tree3f978cd1980cbf73d484a42f71588963fe1402b8 /gnu/usr.bin
parent89c99a8fb8409b68cfa1d7c8e48358f1c19cb20d (diff)
don't hardcode `install'
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/texinfo/Makefile.bsd-wrapper14
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
index ade4860df7b..670d35c1ce9 100644
--- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $Id: Makefile.bsd-wrapper,v 1.15 1997/07/24 16:00:50 kstailey Exp $
+# $Id: Makefile.bsd-wrapper,v 1.16 1997/07/24 20:08:25 kstailey Exp $
INFODIR= infodir=${DESTDIR}/usr/share/info
INFOPATH= DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:.
@@ -11,12 +11,6 @@ FSFMAKE= ${MAKE} SUBDIRS="$(SUBDIRS)" $(GNUCFLAGS) $(INFODIR) $(INFOPATH)
.include <bsd.own.mk>
-.if defined (INSTALL_STRIP) && ${INSTALL_STRIP} == "-s"
-INST_PROG='/usr/bin/install -cs'
-.else
-INST_PROG='/usr/bin/install -c'
-.endif
-
all: config.status
${FSFMAKE} LDFLAGS=${LDSTATIC}
@@ -24,10 +18,12 @@ all: config.status
config: .FORCE
-rm -f config.cache
- INSTALL_PROGRAM=$(INST_PROG) /bin/sh ${.CURDIR}/configure --prefix=/usr
+ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+ /bin/sh ${.CURDIR}/configure --prefix=/usr
config.status:
- INSTALL_PROGRAM=$(INST_PROG) /bin/sh ${.CURDIR}/configure --prefix=/usr
+ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+ /bin/sh ${.CURDIR}/configure --prefix=/usr
.ifdef NOMAN
maninstall: