--- Makefile.orig	Sat Jul 11 18:27:32 1998
+++ Makefile	Mon Jul 20 14:38:38 1998
@@ -64,8 +64,10 @@
 # definitions for where the X lib and include directories are.
 # The following are defaults that might work.
 
-XINCLUDE = /usr/include/X11
-XLIB = /usr/lib/X11
+XINCLUDE = $(X11BASE)/include
+XLIB = $(X11BASE)/lib
+
+SYSTEMFLAGS = -DAUTO_END_MODE
 
 # If your compiler can't find these things, try commenting out the
 # above, and uncommenting various versions below. Also look around
@@ -90,11 +92,11 @@
 # --------------------
 
 # definition for where to install xzip executable and man page
-DESTDIR = /usr/local
+DESTDIR = $(PREFIX)
 
 # --------------------
 
-CFLAGS = -O $(SYSTEMFLAGS) -I$(XINCLUDE)
+CFLAGS += $(SYSTEMFLAGS) -I$(XINCLUDE)
 LDFLAGS =
 LIBS = -L$(XLIB) -lX11 $(SYSTEMLIBS)
 
@@ -152,8 +154,8 @@
 	$(CC) $(CFLAGS) $(FONTDEFAULTLIST) -c xinit.c
 
 install: $(PROGRAM)
-	install -s $(PROGRAM) $(DESTDIR)/bin
-	install $(PROGRAM).1 $(DESTDIR)/man/man1
+	${BSD_INSTALL_PROGRAM} $(PROGRAM) $(DESTDIR)/bin
+	${BSD_INSTALL_DATA} $(PROGRAM).1 $(DESTDIR)/man/man1
 
 clean :
 	-rm -f *~ *.o $(PROGRAM) test