Date: Wed, 11 Jun 2003 20:45:51 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Bill Paul <wpaul@FreeBSD.org> Cc: current@FreeBSD.org Subject: Makefile.yp aka /var/yp/Makefile.dist Message-ID: <20030611174551.GA14100@sunbay.com>
next in thread | raw e-mail | index | archive | help
--eJnRUKwClWJh1Khz
Content-Type: multipart/mixed; boundary="opJtzjQTFsWo+cga"
Content-Disposition: inline
--opJtzjQTFsWo+cga
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
--opJtzjQTFsWo+cga
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p
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
[...]
--opJtzjQTFsWo+cga--
--eJnRUKwClWJh1Khz
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+52rPUkv4P6juNwoRAnMzAJ9ni5lD5bRmehDbuh9ZcczVpatrYQCfQSuh
+dungNXSfk6ZqJ0LD841JzA=
=Mtig
-----END PGP SIGNATURE-----
--eJnRUKwClWJh1Khz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030611174551.GA14100>