--- Makefile.orig	Tue Jan 18 15:01:17 2000
+++ Makefile	Mon Jul 23 03:35:47 2001
@@ -13,22 +13,22 @@
 #
  
 # Put the location of your Perl binary here:
-PERL = /bin/perl
+PERL = /usr/bin/perl
 
 # What do you call your C compiler?
 CC = cc
  
 # Where do you want Majordomo to be installed?  This CANNOT be the
 # current directory (where you unpacked the distribution)
-W_HOME = /usr/test/majordomo-$(VERSION)
+W_HOME = ${PREFIX}/majordomo
  
 # Where do you want man pages to be installed?
-MAN = $(W_HOME)/man
+MAN = ${PREFIX}/man
  
 # You need to have or create a user and group which majordomo will run as.
 # Enter the numeric UID and GID (not their names!) here:
-W_USER = 123
-W_GROUP = 45
+W_USER = %%MJUID%%
+W_GROUP = %%MJGID%%
 
 # These set the permissions for all installed files and executables (except
 # the wrapper), respectively.  Some sites may wish to make these more
@@ -40,9 +40,9 @@
 # If your system is POSIX (e.g. Sun Solaris, SGI Irix 5 and 6, Dec Ultrix MIPS,
 # BSDI or other 4.4-based BSD, Linux) use the following four lines.  Do not
 # change these values!
-WRAPPER_OWNER = root
+WRAPPER_OWNER = $(W_USER)
 WRAPPER_GROUP = $(W_GROUP)
-WRAPPER_MODE = 4755
+WRAPPER_MODE = 4550
 POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GID=$(W_GROUP)
 # Otherwise, if your system is NOT POSIX (e.g. SunOS 4.x, SGI Irix 4,
 # HP DomainOS) then comment out the above four lines and uncomment
@@ -62,11 +62,11 @@
 # parent process, and without the leading "W_" in the variable names) gets
 # passed to processes run by "wrapper"
 W_SHELL = /bin/sh
-W_PATH = /bin:/usr/bin:/usr/ucb
+W_PATH = /bin:/usr/bin
 W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
 
 # A directory for temp files..
-TMPDIR = /usr/tmp
+TMPDIR ?= /var/tmp
 
 #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
 
@@ -103,7 +103,7 @@
 	@echo "    install-scripts: only install the scripts."
 	@echo "    wrapper: only make wrapper."
 
-install: wrapper install-scripts install-cf install-man
+install: wrapper install-scripts install-cf
 	@echo ""
 	@echo "To finish the installation, 'su' to root and type:"
 	@echo ""