--- Makefile.orig	Thu Jul 15 00:31:35 1999
+++ Makefile	Sat May 27 14:40:42 2000
@@ -2,7 +2,10 @@
 #
 # Where to install ezfm files
 #
-DEST_DIR=/usr/local
+LOCALBASE?=/usr/local
+X11BASE?=/usr/local
+PREFIX?=${LOCALBASE}
+DEST_DIR=${PREFIX}
 #
 #
 EZFM_MAGIC=$(DEST_DIR)/lib/ezfm/ezfmMagic
@@ -25,12 +28,13 @@
 #
 #----------------------------------------------------------------------------------
 #
-CC= gcc  -g -DLINUX -I../include
+CC?= gcc  -g -DLINUX -I../include
+CFLAGS+= -I$(LOCALBASE)/include
 
 #
 #----------------------------------------------------------------------------------
-LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
-STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
+LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
+STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${LOCALBASE}/lib -lX11 -lXext  -lm  -lc
 
 SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \
      signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
@@ -45,10 +49,10 @@
 all: ezfm  ezfmMagic
 
 ezfm: libfile.a $(OBJECTS)
-	$(CC) $(CFLAG)  -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB)
+	$(CC) $(CFLAGS)  -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB)
 
 ezfm-static: libfile.a $(OBJECTS)
-	$(CC) $(CFLAG)  -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB)
+	$(CC) $(CFLAGS)  -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB)
 
 
 install: ezfm ezfmMagic ezfmExtension ezfmrc ezfmIcons
@@ -62,7 +66,7 @@
 	cp ezfm $(BIN)
 
 libfile.a:
-	(cd libfile; make libfile.a CC="gcc -O"; mv libfile.a ../ )
+	(cd libfile; make libfile.a; mv libfile.a ../ )
 	- ranlib libfile.a
 
 ezfmMagic:
@@ -79,13 +83,13 @@
 	$(RM)  $(OBJECTS) ezfm
  
 .c.o:
-	$(CC) $(CFLAG) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 .o:
 	$(CC) $<  -o $@  $(LIBS) $(JPEG_LIB)
 
 .c:
-	$(CC) $(CFLAG)  $< -o $@  $(LIBS) $(JPEG_LIB)
+	$(CC) $(CFLAGS)  $< -o $@  $(LIBS) $(JPEG_LIB)
 
 #
 #  That's all folks,