--- GNUmakefile.orig	Sat Sep 22 01:26:48 2001
+++ GNUmakefile	Wed Oct 10 00:00:00 2001
@@ -69,7 +69,7 @@
 
 default: $(DEFAULT_TARGET)
 
-all: nonmerge
+all: default
 
 .PHONY: nonmerge
 nonmerge: $(SUBDIRS)
@@ -160,10 +160,10 @@
 install.hdr: $(INSTALLHDRS) $(SRCDIR)/pm_config.h
 # See notes in Makefile.common about how $(INSTALL) varies from one 
 # platform to another.
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
+	${BSD_INSTALL_DATA} \
 	    $(SRCDIR)/pm_config.h $(INSTALLHDRS)
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-	    $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
+	${BSD_INSTALL_DATA} \
+	    $(SRCDIR)/shhopt/pm_shhopt.h $(INSTALLHDRS)
 	for i in $(SUBDIRS) ; do \
 	    $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \
 	done