summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-08-01 20:12:31 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-08-01 20:12:31 +0000
commit7c3027ea5b440f2bc8804dcc94fd9c760486ec50 (patch)
tree0d6cefb030bc53553dfe1a4d36108cd369822158 /usr.bin
parentca8e19d3a34685d430feccc90d4c2a9fba1612c7 (diff)
reduce GLOBAL_AUTOCONF_CACHE code.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/less/Makefile.bsd-wrapper25
1 files changed, 12 insertions, 13 deletions
diff --git a/usr.bin/less/Makefile.bsd-wrapper b/usr.bin/less/Makefile.bsd-wrapper
index 335639d770a..f8a277bf273 100644
--- a/usr.bin/less/Makefile.bsd-wrapper
+++ b/usr.bin/less/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.13 1997/07/29 03:37:04 kstailey Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.14 1997/08/01 20:12:30 kstailey Exp $
#
# less config
@@ -44,22 +44,21 @@ OBJS= main.o screen.o brac.o ch.o charset.o cmdbuf.o \
.FORCE: .IGNORE
.ifdef GLOBAL_AUTOCONF_CACHE
-config: .FORCE
- /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \
- --cache-file=${GLOBAL_AUTOCONF_CACHE}
-
-config.status:
- /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \
- --cache-file=${GLOBAL_AUTOCONF_CACHE}
+CF= --cache-file=${GLOBAL_AUTOCONF_CACHE}
.else
-config: .FORCE
- -rm -f config.cache
- /bin/sh ${.CURDIR}/configure --prefix=${PREFIX}
+CF=
+.endif
-config.status:
- /bin/sh ${.CURDIR}/configure --prefix=${PREFIX}
+config: .FORCE
+.ifndef GLOBAL_AUTOCONF_CACHE
+ -rm -f config.cache
.endif
+ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+ /bin/sh ${.CURDIR}/configure --prefix=/usr $(CF)
+config.status:
+ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+ /bin/sh ${.CURDIR}/configure --prefix=/usr $(CF)
gnu_build:
${MAKE} ${WCC} ${WCFLAGS} ${WLDFLAGS} LIBS=${LIBS} datadir=${DATADIR} \