*** Makefile.orig	Mon May 15 11:16:37 2000
--- Makefile	Wed Jun  7 20:11:44 2000
***************
*** 13,19 ****
  # resolver for hosts not in the current domain. 
  #B=-b
  B=
! DIR =/etc
  #
  # If the passwd, shadow and/or adjunct files used by rpc.yppasswdd
  # live in directory other than /etc then you'll need to change the
--- 13,19 ----
  # resolver for hosts not in the current domain. 
  #B=-b
  B=
! DIR =/etc/.ypfiles
  #
  # If the passwd, shadow and/or adjunct files used by rpc.yppasswdd
  # live in directory other than /etc then you'll need to change the
***************
*** 21,27 ****
  # DO NOT indent the line, however, since /etc/init.d/yp attempts
  # to find it with grep "^PWDIR" ...
  #
! PWDIR =/etc
  DOM = `domainname`
  NOPUSH = ""
  ALIASES = /etc/mail/aliases
--- 21,27 ----
  # DO NOT indent the line, however, since /etc/init.d/yp attempts
  # to find it with grep "^PWDIR" ...
  #
! PWDIR =/etc/.ypfiles
  DOM = `domainname`
  NOPUSH = ""
  ALIASES = /etc/mail/aliases
***************
*** 46,52 ****
  
  all: passwd group hosts ethers networks rpc services protocols \
  	netgroup bootparams aliases publickey netid netmasks c2secure \
! 	timezone auto.master auto.home
  
  c2secure:
  	-@if [ -f $(PWDIR)/security/passwd.adjunct ]; then \
--- 46,52 ----
  
  all: passwd group hosts ethers networks rpc services protocols \
  	netgroup bootparams aliases publickey netid netmasks c2secure \
! 	timezone locale amd.home auto.master auto.home
  
  c2secure:
  	-@if [ -f $(PWDIR)/security/passwd.adjunct ]; then \
***************
*** 184,189 ****
--- 184,190 ----
  	@if [ ! $(NOPUSH) ]; then echo "pushed bootparams"; fi
  
  aliases.time: $(ALIASES)
+ 	@chmod go-w $(YPDBDIR)/$(DOM)
  	@cp $(ALIASES) $(YPDBDIR)/$(DOM)/mail.aliases;
  	@/usr/lib/sendmail -bi -oA$(YPDBDIR)/$(DOM)/mail.aliases;
  	$(MKALIAS) $(YPDBDIR)/$(DOM)/mail.aliases $(YPDBDIR)/$(DOM)/mail.byaddr;
***************
*** 271,276 ****
--- 272,319 ----
  		echo "couldn't find $(DIR)/timezone"; \
  	fi
  
+ locale.time:  $(DIR)/locale
+ 	-@if [ -f $(DIR)/locale ]; then \
+ 		sed -e "/^#/d" -e s/#.*$$// $(DIR)/locale \
+ 		| awk '{for (i = 2; i<=NF; i++) print $$i, $$0}' \
+ 		| $(MAKEDBM) - $(YPDBDIR)/$(DOM)/locale.byname; \
+ 		touch locale.time; \
+ 		echo "updated locale"; \
+ 		if [ ! $(NOPUSH) ]; then \
+ 			$(YPPUSH) locale.byname; \
+ 			echo "pushed locale"; \
+ 		else \
+ 		: ; \
+ 		fi \
+ 	else \
+ 		echo "couldn't find $(DIR)/locale"; \
+ 	fi
+ 
+ amd.home.time:	$(DIR)/amd.home
+ 	-@if [ -f $(DIR)/amd.home ]; then \
+ 		sed -e "s/#.*$$//" -e "/^$$/d" $(DIR)/amd.home | \
+ 		awk '{ \
+ 			for (i = 1; i<=NF; i++) \
+ 			    if (i == NF) { \
+ 				if (substr($$i, length($$i), 1) == "\\") \
+ 				    printf("%s", substr($$i, 1, length($$i) - 1)); \
+ 				else \
+ 				    printf("%s\n", $$i); \
+ 				} \
+ 			    else \
+ 				printf("%s ", $$i); \
+ 		      }' | \
+ 		$(MAKEDBM) - $(YPDBDIR)/$(DOM)/amd.home; \
+ 		touch amd.home.time; \
+ 		echo "updated amd.home"; \
+ 		if [ ! $(NOPUSH) ]; then \
+ 			$(YPPUSH) amd.home; \
+ 			echo "pushed amd.home"; \
+ 		else \
+ 		: ; \
+ 		fi \
+ 	fi
+ 
  auto.master.time:  $(DIR)/auto_master
  	-@if [ -f $(DIR)/auto_master ]; then \
  		sed -e "/^#/d" -e s/#.*$$// $(DIR)/auto_master \
***************
*** 321,326 ****
--- 364,371 ----
  group.adjunct: group.adjunct.time
  netmasks: netmasks.time
  timezone: timezone.time
+ locale: locale.time
+ amd.home: amd.home.time
  auto.master: auto.master.time
  auto.home: auto.home.time
  $(DIR)/netid: