--- Makefile.bak	Mon Apr 10 14:27:52 1995
+++ Makefile	Sat Apr 22 17:11:43 1995
@@ -2,7 +2,7 @@
 
 # BASENAME should point to where the whole lot will be installed
 # change BASENAME to your home directory if need be
-BASENAME	= /usr/local
+BASENAME	= $(PREFIX)
 # For display in the man pages
 VISIBLE_BASENAME= $(BASENAME)
 
@@ -53,7 +53,11 @@
 
 # Makefile.0 - mark, don't (re)move this, a sed script needs it
 
+.if defined(PACKAGE_BUILDING)
+LOCKINGTEST=/tmp .
+.else
 LOCKINGTEST=__defaults__
+.endif
 
 #LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
 #			If LOCKINGTEST is defined, autoconf will NOT
@@ -86,7 +86,7 @@
  -Waggregate-return #-Wuninitialized
 
 # The place to put your favourite extra cc flag
-CFLAGS0 = -O #$(GCC_WARNINGS)
+CFLAGS0 = #-O #$(GCC_WARNINGS)
 LDFLAGS0= -s
 # Read my libs :-)
 LIBS=
--- initmake.bak	Mon Apr 10 14:28:00 1995
+++ initmake	Sat Apr 22 17:11:23 1995
@@ -336,8 +336,8 @@
 test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
 test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
 
-echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
-echo "LDFLAGS	= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
+echo "CFLAGS	+= \$(CFLAGS1)$CFLAGS"			>>_Makefile
+echo "LDFLAGS	+= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
 echo							>>_Makefile
 
 MANSS=""
--- src/recommend.c.bak	Thu Aug 18 08:45:20 1994
+++ src/recommend.c	Sat Apr 22 17:11:23 1995
@@ -52,8 +52,10 @@
      printf("chmod %o %s\n",sgid|PERMIS,argv[2]);
   else if(chmdir==1)
      goto nogchmod;
+#ifndef __FreeBSD__
   if(chmdir)
      printf("chmod %c+w %s.\n",chmdir==1?'g':'a',systm_mbox);
+#endif
 nogchmod:
   return EXIT_SUCCESS;
 }