diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-09-15 07:12:19 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-09-15 07:12:19 +0000 |
| commit | 243432fb31fbfb39243f355e86a3ab5787ecce18 (patch) | |
| tree | c6ea669b56950bdcf7c2e4c4520d9c4d69b5c654 | |
| parent | fb8d36e9a4e52fda0396db43ab2679663a22e32a (diff) | |
uniformize LINKS, so that it gets handled in realinstall all the time
(and the same way).
okay otto@
| -rw-r--r-- | share/mk/bsd.lkm.mk | 22 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 8 |
2 files changed, 13 insertions, 17 deletions
diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk index aac3c0dbe09..58494fc4e32 100644 --- a/share/mk/bsd.lkm.mk +++ b/share/mk/bsd.lkm.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lkm.mk,v 1.19 2003/05/20 22:49:13 millert Exp $ +# $OpenBSD: bsd.lkm.mk,v 1.20 2005/09/15 07:12:18 espie Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -73,6 +73,14 @@ realinstall: ${.CURDIR}/${POSTINSTALL} ${DESTDIR}${LKMDIR} .endif .endif +.if defined(LINKS) && !empty(LINKS) +. for lnk file in ${LINKS} + @l=${DESTDIR}${LKMDIR}${lnk}; \ + t=${DESTDIR}${LKMDIR}${file}; \ + echo $$t -\> $$l; \ + rm -f $$t; ln $$l $$t +. endfor +.endif .endif @@ -87,18 +95,6 @@ unload: modunload -n $(LKM) install: maninstall _SUBDIRUSE -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}${LKMDIR}/$$1; \ - shift; \ - t=${DESTDIR}${LKMDIR}/$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln $$l $$t; \ - done; true -.endif maninstall: afterinstall afterinstall: realinstall diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 1c97ce0abd0..ecfa7e0cbb1 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.44 2005/04/15 17:18:57 espie Exp $ +# $OpenBSD: bsd.prog.mk,v 1.45 2005/09/15 07:12:18 espie Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -124,9 +124,6 @@ realinstall: ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} \ -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/${PROG} .endif -.endif - -install: maninstall _SUBDIRUSE .if defined(LINKS) && !empty(LINKS) . for lnk file in ${LINKS} @l=${DESTDIR}${lnk}; \ @@ -135,6 +132,9 @@ install: maninstall _SUBDIRUSE rm -f $$t; ln $$l $$t . endfor .endif +.endif + +install: maninstall _SUBDIRUSE maninstall: afterinstall afterinstall: realinstall |