Browse Source

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.
OPENBSD_2_1
millert 27 years ago
parent
commit
991fb15882
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      src/include/Makefile
  2. +2
    -2
      src/lib/libutil/Makefile

+ 3
- 3
src/include/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 1997/04/19 21:26:15 millert Exp $
# $OpenBSD: Makefile,v 1.40 1997/04/27 20:55:58 millert Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
@ -52,7 +52,7 @@ includes:
@echo installing ${FILES}
@-for i in ${FILES}; do \
cmp -s $$i ${DESTDIR}/usr/include/$$i || \
${INSTALL} ${COPY} -m 444 $$i ${DESTDIR}/usr/include/$$i; \
${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}/usr/include/$$i; \
done
@echo installing ${DIRS}
@-for i in ${DIRS}; do \
@ -60,7 +60,7 @@ includes:
${DESTDIR}/usr/include/$$i; \
(cd $$i; for j in *.[ih]; do \
cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j || \
${INSTALL} ${COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
${INSTALL} ${INSTALL_COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
done); \
done
@echo installing ${LFILES}


+ 2
- 2
src/lib/libutil/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 1997/02/16 19:59:17 provos Exp $
# $OpenBSD: Makefile,v 1.13 1997/04/27 20:56:18 millert Exp $
# $NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $
LIB= util
@ -38,7 +38,7 @@ MLINKS+=scsi.3 scsi_debug_output.3
includes:
@cd ${.CURDIR}; for i in $(HDRS); do \
j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
${DESTDIR}/usr/include"; \
echo $$j; \
eval "$$j"; \


Loading…
Cancel
Save