diff -Naur Makefile.orig Makefile
--- xfplan-0.1/Makefile.orig    2005-06-01 21:48:31.000000000 -0400
+++ xfplan-0.1/Makefile        2005-06-01 22:09:36.000000000 -0400
@@ -68,11 +68,11 @@
 
 # ---------------------------------------------------------------------------
 # Eventual final destination for program:
-prefix = /usr/local
+prefix = @PREFIX@
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share/fplan
-mandir = $(prefix)/man
+mandir = $(prefix)/share/man
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 man1ext = .1
@@ -117,7 +117,7 @@
 # Define any additional flags required by the C compiler during the
 # compilation phase (such as flags for debugging or optimization,
 # include -DOS2 when building under OS2/EMX, and -DDOS under MS-DOS)
-CCOPTS = -O
+#CCOPTS = -O
 #CCOPTS = -g
 #
 #CCOPTS = -O2 -m486 -fomit-frame-pointer
@@ -126,6 +126,7 @@
 #CCOPTS = -g -DDEBUG -Wall -pedantic
 #CCOPTS = -O -DOS2
 #CCOPTS = -O -DMSDOS
+CCOPTS = -no-cpp-precomp -I@PREFIX@/include
 
 # ---------------------------------------------------------------------------
 # Define any additional flags required by the loader for the link phase,
@@ -318,7 +319,7 @@
        $(PROTODIR)$(man1dir) $(PROTODIR)$(man5dir)
 
 
-install: install-exe install-man install-dbs
+install: install-exe install-man
 
 install-exe: $(EXES) $(PROTODIR)$(bindir)
        $(INSTALL) $(EXES) $(PROTODIR)$(bindir)

diff -Naur config.h config.h.new
--- xfplan-0.1/config.h    2005-06-01 21:48:31.000000000 -0400
+++ xfplan-0.1/config.h.new        2005-06-01 22:01:22.000000000 -0400
@@ -31,11 +31,11 @@
  */
 
 #ifndef	DEFAULT_FPLAN_PATH
-#define	DEFAULT_FPLAN_PATH	"/usr/local/share/fplan:/usr/share/fplan"
+#define	DEFAULT_FPLAN_PATH	"@PREFIX@/share/fplan"
 #endif
 
 #ifndef DEFAULT_COMMON_DBDIR
-#define DEFAULT_COMMON_DBDIR	"/usr/local/share/fplan"
+#define DEFAULT_COMMON_DBDIR	"@PREFIX@/share/fplan"
 #endif
 
 /*