--- Makefile.orig	Fri Aug 10 01:17:55 2001
+++ Makefile	Fri Aug 10 01:19:48 2001
@@ -5,13 +5,11 @@
 ######################################################################
 # Change the following to suit your needs
 
-SHELL=/bin/bash
-
 # The directory root of your installation
 # If you make a personal installation, change it to your home directory
 # Default: /usr
 # uncomment the following line to install to the default directories...
-TREE=/usr
+TREE=${PREFIX}
 # ...or the following line to install into your home directory:
 # TREE=$(HOME)
 
@@ -25,7 +23,7 @@
 BINDIR=$(TREE)/bin
 
 # directory to install the manual pages
-MANDIR=$(TREE)/man
+MANDIR=${MANPREFIX}/man
 
 #directory to install the data directory
 DATADIR=$(TREE)/lib
@@ -36,11 +34,9 @@
 # A catalog will be created: $(DOCDIR)/gp
 # It will *not* be uninstalled automagically after a "make uninstall"
 
-DOCDIR=$(TREE)/doc
+DOCDIR=${PREFIX}/share/doc
 
 # Your favourite ANSI compiler and it's flags
-CC=gcc
-CFLAGS=-pedantic -O3 -Wall -g
 
 ######################################################################
 # Do not change anything below this line
@@ -58,7 +54,7 @@
 	mporfs.seq
 
 all: 
-	cd src ; make PROGRAMS="$(PROGRAMS)" GDPROGRAMS="$(GDPROGRAMS)" CC=$(CC) \
+	cd src ; ${GMAKE} PROGRAMS="$(PROGRAMS)" GDPROGRAMS="$(GDPROGRAMS)" CC=$(CC) \
 		LIBS="$(LIBS)" CFLAGS="$(CFLAGS)" ; 
 	@echo -e "\nAll programs compiled. \nType 'make install' to install all programs."
 
