Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk fix link creation:
details: https://anonhg.NetBSD.org/src/rev/24be7b5ddcb0
branches: trunk
changeset: 481965:24be7b5ddcb0
user: drochner <drochner%NetBSD.org@localhost>
date: Thu Feb 10 18:18:01 2000 +0000
description:
fix link creation:
-put "echo"s for the daughter Makefile into a subshell to get them all
into the Makefile (instead of stdout - should fix PR misc/9336 by
Bernd Ernesti)
-change operator for "realall" back to ":" - rules are supposed to
accumulate, and "::" clashes with the definition in <bsd.own.mk>
-call sub-make with the "all" target to make sure we don't get just
the first rule
diffstat:
share/mk/bsd.kinc.mk | 9 +++++----
share/mk/bsd.links.mk | 16 +++++++++-------
2 files changed, 14 insertions(+), 11 deletions(-)
diffs (88 lines):
diff -r 134706435a34 -r 24be7b5ddcb0 share/mk/bsd.kinc.mk
--- a/share/mk/bsd.kinc.mk Thu Feb 10 16:45:37 2000 +0000
+++ b/share/mk/bsd.kinc.mk Thu Feb 10 18:18:01 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kinc.mk,v 1.9 2000/01/24 06:54:27 mycroft Exp $
+# $NetBSD: bsd.kinc.mk,v 1.10 2000/02/10 18:18:01 drochner Exp $
# System configuration variables:
#
@@ -115,20 +115,21 @@
.if defined(SYMLINKS) && !empty(SYMLINKS)
incinstall::
- @set ${SYMLINKS}; \
+ @(set ${SYMLINKS}; \
echo ".include <bsd.own.mk>"; \
while test $$# -ge 2; do \
l=$$1; \
shift; \
t=${DESTDIR}$$1; \
shift; \
- echo "realall:: $$t"; \
+ echo "realall: $$t"; \
echo ".PHONY: $$t"; \
echo "$$t:"; \
echo " @echo \"$$t -> $$l\""; \
echo " @rm -rf $$t"; \
echo " @ln -s $$l $$t"; \
- done | ${MAKE} -f-
+ done; \
+ ) | ${MAKE} -f- all
.endif
.if !target(incinstall)
diff -r 134706435a34 -r 24be7b5ddcb0 share/mk/bsd.links.mk
--- a/share/mk/bsd.links.mk Thu Feb 10 16:45:37 2000 +0000
+++ b/share/mk/bsd.links.mk Thu Feb 10 18:18:01 2000 +0000
@@ -1,41 +1,43 @@
-# $NetBSD: bsd.links.mk,v 1.10 2000/01/24 06:54:27 mycroft Exp $
+# $NetBSD: bsd.links.mk,v 1.11 2000/02/10 18:18:02 drochner Exp $
.PHONY: linksinstall
realinstall: linksinstall
.if defined(SYMLINKS) && !empty(SYMLINKS)
linksinstall::
- @set ${SYMLINKS}; \
+ @(set ${SYMLINKS}; \
echo ".include <bsd.own.mk>"; \
while test $$# -ge 2; do \
l=$$1; \
shift; \
t=${DESTDIR}$$1; \
shift; \
- echo "realall:: $$t"; \
+ echo "realall: $$t"; \
echo ".PHONY: $$t"; \
echo "$$t:"; \
echo " @echo \"$$t -> $$l\""; \
echo " @rm -f $$t"; \
echo " @ln -s $$l $$t"; \
- done | ${MAKE} -f-
+ done; \
+ ) | ${MAKE} -f- all
.endif
.if defined(LINKS) && !empty(LINKS)
linksinstall::
- @set ${LINKS}; \
+ @(set ${LINKS}; \
echo ".include <bsd.own.mk>"; \
while test $$# -ge 2; do \
l=${DESTDIR}$$1; \
shift; \
t=${DESTDIR}$$1; \
shift; \
- echo "realall:: $$t"; \
+ echo "realall: $$t"; \
echo ".PHONY: $$t"; \
echo "$$t:"; \
echo " @echo \"$$t -> $$l\""; \
echo " @rm -f $$t"; \
echo " @ln $$l $$t"; \
- done | ${MAKE} -f-
+ done; \
+ ) | ${MAKE} -f- all
.endif
.if !target(linksinstall)
Home |
Main Index |
Thread Index |
Old Index