--- Makefile.orig	Fri Sep 25 11:26:04 1998
+++ Makefile	Fri Nov 13 19:21:02 1998
@@ -5,13 +5,13 @@
 # You may want to edit some of the following variables.
 
 # Where to install the X11 binary
-X11BIN = /usr/local/X11
+X11BIN = $(PREFIX)/bin
 
 # Where to install the SunView binary
 SUNVIEWBIN = /usr/local/Sunview
 
 # Where to put the manual page
-MANDIR = /usr/local/man/man1
+MANDIR = $(PREFIX)/man/man1
 
 # The suffix to use for the manual page
 MANSUFFIX = 1
@@ -19,12 +19,12 @@
 # The directory where X include files live.
 # Comment out or change this line if you don't want
 # /usr/openwin/include searched
-X11INCLUDE=-I/usr/openwin/include
+X11INCLUDE=-I$(X11BASE)/include
 
 # The arguments to cc needed to link against the Xlib library.
 # Change this to an explicit path (e.g. /usr/X11/lib/libX11.a)
 # if your Xlib lives in a place that won't be found by -lX11.
-X11LIB = -lX11
+X11LIB = -L$(X11BASE)/lib -lX11
 #
 # For Red Hat 5.0 Linux, uncomment the line below to get the X11 library
 #X11LIB = /usr/X11/lib/libX11.a
@@ -57,15 +57,15 @@
 MAKE = make	# for makes that don't do this automatically
 
 CC = cc
-CFLAGS = -g
+#CFLAGS = -g
 
 # Use these flags by default
-RANLIB = :
-SVR4_LINKFLAGS=-R/usr/openwin/lib -L/usr/openwin/lib
-LINKFLAGS = ${SVR4_LINKFLAGS}
+#RANLIB = :
+#SVR4_LINKFLAGS=-R/usr/openwin/lib -L/usr/openwin/lib
+#LINKFLAGS = ${SVR4_LINKFLAGS}
 
 # Flags for SunOS 4.1.3
-#RANLIB = ranlib
+RANLIB = ranlib
 
 SUBMAKEFLAGS= CC="${CC}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" ${EXTRA_SUBMAKEFLAGS}
 
@@ -88,7 +88,7 @@
 # We can zap this when we sort out xc_builtins.c.
 #
 ups: ups/develhdrs ${X11LIBS}
-	cd ups && ${MAKE} ${MFLAGS} X11LIB=${X11LIB} LINKFLAGS="${LINKFLAGS}" ${X11WNFLAGS} ${SUBMAKEFLAGS} ${UPS_TARGET}
+	cd ups && ${MAKE} ${MFLAGS} X11LIB="${X11LIB}" LINKFLAGS="${LINKFLAGS}" ${X11WNFLAGS} ${SUBMAKEFLAGS} ${UPS_TARGET}
 
 libx11wn:
 	cd lib/$@ && ${MAKE} ${MFLAGS} ${SUBMAKEFLAGS} ${X11WNFLAGS}
