Makefile.yp aka /var/yp/Makefile.dist

[Ruslan Ermilov]

Just as a precaution, does anyone have any objections to my removing
of these funny $^ sequences from Makefile.yp?  They were apparently
used to insert something into the map generation pipeline just before
the yp_mkdb(8) invokation, but recent additions to this file did not
follow this "rule".

Partial patch is attached.


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software Ltd,
ru at FreeBSD.org		FreeBSD committer
-------------- next part --------------
Index: Makefile.yp
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ypserv/Makefile.yp,v
retrieving revision 1.34
diff -u -r1.34 Makefile.yp
--- Makefile.yp	21 Mar 2003 11:44:03 -0000	1.34
+++ Makefile.yp	11 Jun 2003 17:40:23 -0000
@@ -235,7 +235,7 @@
 ypservers: $(YPSERVERS)
 	@echo "Updating $@..."
 	$(CAT) $(YPSERVERS) | \
-	$(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*") print $$0"\t"$$0 }' $^ \
+	$(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*") print $$0"\t"$$0 }' \
 		| $(DBLOAD) -i $(YPSERVERS) -o $(YPMAPDIR)/$@ - $(TMP); \
 		$(RMV) $(TMP) $@
 	@$(DBLOAD) -c
@@ -249,7 +249,7 @@
 .else
 	$(CAT) $(ETHERS) | \
 	$(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
-		print $$2"\t"$$0 }' $^ | $(DBLOAD) -i $(ETHERS) \
+		print $$2"\t"$$0 }' | $(DBLOAD) -i $(ETHERS) \
 		-o $(YPMAPDIR)/$@ - $(TMP); $(RMV) $(TMP) $@
 	@$(DBLOAD) -c
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi
[...]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20030611/94234ee3/attachment.bin