--- Makefile.orig	2003-06-21 15:16:34 UTC
+++ Makefile
@@ -35,24 +35,24 @@ STRIP    = strip
 
 # Installation sites (GNU conventions):
 #
-prefix   = /usr/local
+prefix   = ${PREFIX}
 bindir   = $(prefix)/bin
 includedir = $(prefix)/include
-mandir   = $(prefix)/man
+mandir   = $(prefix)/share/man
 man1dir  = $(mandir)/man1
 infodir  = $(prefix)/info
 
 # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
 # For non-gcc compilers, simply set CFLAGS = -O (to start with)
 #
-CC       = gcc
-CFLAGS	=  -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
+#CC       = gcc
+#CFLAGS	=  -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
 LINT	= splint
 LINTFLAGS = -weak -initallelements +posixlib -I/usr/X11R6/include $(DEFINES) $(EX_DEFS)
 
 #CFLAGS   = +O1 -Aa -D_HPUX_SOURCE -DSYSV -I/usr/include/X11R5 -I/usr/include/X11R4 $(DEFINES) $(EX_DEFS)
 
-LFLAGS   = -L/usr/X11R6/lib            # only sometimes needed; see below for examples
+#LFLAGS   = -L/usr/X11R6/lib            # only sometimes needed; see below for examples
 CPPFLAGS = -I.            # only sometimes needed; see below for examples
 BINDCMD  =                # only needed for EMX and DJGPP DOS extenders
 
@@ -65,9 +65,9 @@ BINDCMD  =                # only needed for EMX and DJ
 #
 # Generic UNIX + X11 previewer (default)
 #
-DEFINES   = -DUNIX -DHAS_UNIX_X11 
-PREVIEWER = to_x11
-ALL_LIBS  =  -L/usr/lib/X11R6 -lX11 -lm     
+#DEFINES   = -DUNIX -DHAS_UNIX_X11 
+#PREVIEWER = to_x11
+#ALL_LIBS  =  -L/usr/lib/X11R6 -lX11 -lm     
 #
 # for experimental truetype font support
 #
@@ -230,13 +230,13 @@ SRCS	= clip.c fillpoly.c\
 
 # $(SRCS) NOT USED YET:
 SRCS	= clip.c fillpoly.c\
-	  hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c getopt.c getopt1.c \
+	  hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c \
 	  $(ALL_INCS)\
 	  to_vec.c to_pcx.c to_pcl.c to_eps.c to_img.c to_pbm.c  \
 	  to_rgip.c to_fig.c std_main.c $(PREVIEWER).c pendef.c lindef.c $(EX_SRC)
 
 OBJS	= clip.o fillpoly.o\
-	  hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o getopt.o getopt1.o \
+	  hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o \
 	  to_vec.o to_pcx.o to_pcl.o  to_eps.o to_img.o to_pbm.o \
 	  to_rgip.o to_fig.o std_main.o $(PREVIEWER).o pendef.o lindef.o $(EX_OBJ)
 
@@ -244,8 +244,9 @@ $(PROGRAM): $(OBJS)
 
 $(PROGRAM): $(OBJS)
 	$(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) $(EX_LIBS) -o $(PROGRAM)
-	$(BINDCMD)
 
+all: $(PROGRAM) 
+
 default:
 	@echo "This makefile needs manual configuration! Edit it now!
 	@echo "After configuration, you may use the following commands:
@@ -268,9 +269,9 @@ default:
 #									#
 #########################################################################
 
-# .c.o:	$< $(COMMON_INCS)
-#	-$(RMCMD) $@
-#	$(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
+.c.o:	$< $(COMMON_INCS)
+	-$(RMCMD) $@
+	$(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
 
 
 #########################################################################
@@ -327,18 +328,14 @@ TAGS:
 TAGS:
 	@echo make TAGS -- not supported nor needed.
 
-install:	install-bin install-info install-man
+install:	install-bin  install-man
 
 install-bin:	$(PROGRAM)
-		-$(STRIP) $(PROGRAM)
-		-$(CP) $(PROGRAM) $(bindir)
-		-$(CHMOD) 755 $(bindir)/$(PROGRAM)
+		${BSD_INSTALL_PROGRAM} $(PROGRAM) $(DESTDIR)$(bindir)
 
 install-info:	hp2xx.info
-		-$(CP) hp2xx.info $(infodir)
-		-$(CHMOD) 644 $(infodir)/hp2xx.info
+		${BSD_INSTALL_DATA} hp2xx.info $(DESTDIR)$(infodir)
 
 install-man:	../doc/hp2xx.1
-		-$(CP) ../doc/hp2xx.1 $(man1dir)
-		-$(CHMOD) 644 $(man1dir)/hp2xx.1
+		${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(DESTDIR)$(man1dir)