diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-27 20:57:09 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-04-27 20:57:09 +0000 |
| commit | 56a4230d7d90fb05982c3f285faf62ad514d429a (patch) | |
| tree | 784f50865a80748c56258016bcdf69d47f3e35b1 /share | |
| parent | 5c1f80fa38ed55e3ed266e7cfbf19ea756f32b8d (diff) | |
COPY -> INSTALL_COPY and STRIP -> INSTALL_STRIP
This fixes namespace problems where STRIP is sometimes used as
the name of the strip(1) to use and other times used as
the flag to send install(1) when stripping (or not).
COPY doesn't have this problem (yet) but was poorly named.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/Makefile | 4 | ||||
| -rw-r--r-- | share/termcap/Makefile | 8 | ||||
| -rw-r--r-- | share/terminfo/Makefile | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index 4c814439ca8..37668b471c6 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1996/12/08 14:42:26 downsj Exp $ +# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:23 millert Exp $ # $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $ FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \ @@ -7,7 +7,7 @@ FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \ NOOBJ= noobj install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/mk .include <bsd.prog.mk> diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 802ca99b7d3..e33fa6597d8 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1996/10/06 20:57:05 tholo Exp $ +# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:24 millert Exp $ # from: @(#)Makefile 5.14 (Berkeley) 9/15/92 MAN= termcap.5 @@ -14,11 +14,11 @@ termcap.db: termcap.src cap_mkdb -f termcap ${.OBJDIR}/fixed realinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \ ${DESTDIR}${BINDIR}/misc/termcap.db - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \ ${DESTDIR}${BINDIR}/misc/termcap - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \ ${DESTDIR}${BINDIR}/misc/map3270 ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap diff --git a/share/terminfo/Makefile b/share/terminfo/Makefile index 08c5122dee5..339bd2a332b 100644 --- a/share/terminfo/Makefile +++ b/share/terminfo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 1996/07/22 04:46:01 tholo Exp $ +# $OpenBSD: Makefile,v 1.2 1997/04/27 20:56:25 millert Exp $ #MAN= terminfo.5 @@ -13,7 +13,7 @@ terminfo.db: terminfo.src info_mkdb -f terminfo ${.OBJDIR}/fixed realinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \ ${DESTDIR}${BINDIR}/misc/terminfo.db .include <bsd.prog.mk> |