--- Makefile.in.orig	Sat Jan 15 13:37:34 2000
+++ Makefile.in	Wed Aug 16 00:05:20 2000
@@ -16,13 +16,13 @@
 srcdir		= @srcdir@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
-libdir		= $(exec_prefix)/lib
+datadir		= $(exec_prefix)/share
 includedir		= $(exec_prefix)/include
 docdir		= $(srcdir)/doc
 contribdir		= $(srcdir)/contrib
 thisdir		=@thisdir@
 
-INSTALL		= @INSTALL@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
 
 HTML_EXT		= @HTML_EXT@
@@ -31,7 +31,7 @@
 CFLAGS		= @CFLAGS@
 
 INCDIR		= $(srcdir)
-CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(prefix)/THE/\"
+CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\"
 
 CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
 
@@ -186,23 +186,23 @@
 
 install: the the.man THE_Help.txt
 	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
-	$(INSTALL_DATA) -m 755 -d $(prefix)/THE
-	$(INSTALL) -m 755 ./the $(exec_prefix)/bin/the
-	$(INSTALL_DATA) ./the.man $(prefix)/THE/the.man
-	$(INSTALL_DATA) $(srcdir)/append.the   $(prefix)/THE/append.the
-	$(INSTALL_DATA) $(srcdir)/comm.the     $(prefix)/THE/comm.the
-	$(INSTALL_DATA) $(srcdir)/build.the    $(prefix)/THE/build.the
-	$(INSTALL_DATA) $(srcdir)/setbuild.the $(prefix)/THE/setbuild.the
-	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(prefix)/THE/uncomm.the
-	$(INSTALL_DATA) $(srcdir)/total.the    $(prefix)/THE/total.the
-	$(INSTALL_DATA) $(srcdir)/match.the    $(prefix)/THE/match.the
-	$(INSTALL_DATA) $(srcdir)/rm.the       $(prefix)/THE/rm.the
-	$(INSTALL_DATA) $(srcdir)/words.the    $(prefix)/THE/words.the
-	$(INSTALL_DATA) $(srcdir)/l.the        $(prefix)/THE/l.the
-	$(INSTALL_DATA) $(srcdir)/compile.the  $(prefix)/THE/compile.the
-	$(INSTALL_DATA) $(srcdir)/spell.the    $(prefix)/THE/spell.the
-	$(INSTALL_DATA) $(srcdir)/demo.the     $(prefix)/THE/demo.the
-	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(prefix)/THE/THE_Help.txt
+	$(INSTALL_DATA) -m 755 -d $(datadir)/THE
+	$(INSTALL_PROGRAM) ./the $(exec_prefix)/bin/the
+	$(INSTALL_DATA) ./the.man $(datadir)/THE/the.man
+	$(INSTALL_DATA) $(srcdir)/append.the   $(datadir)/THE/append.the
+	$(INSTALL_DATA) $(srcdir)/comm.the     $(datadir)/THE/comm.the
+	$(INSTALL_DATA) $(srcdir)/build.the    $(datadir)/THE/build.the
+	$(INSTALL_DATA) $(srcdir)/setbuild.the $(datadir)/THE/setbuild.the
+	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(datadir)/THE/uncomm.the
+	$(INSTALL_DATA) $(srcdir)/total.the    $(datadir)/THE/total.the
+	$(INSTALL_DATA) $(srcdir)/match.the    $(datadir)/THE/match.the
+	$(INSTALL_DATA) $(srcdir)/rm.the       $(datadir)/THE/rm.the
+	$(INSTALL_DATA) $(srcdir)/words.the    $(datadir)/THE/words.the
+	$(INSTALL_DATA) $(srcdir)/l.the        $(datadir)/THE/l.the
+	$(INSTALL_DATA) $(srcdir)/compile.the  $(datadir)/THE/compile.the
+	$(INSTALL_DATA) $(srcdir)/spell.the    $(datadir)/THE/spell.the
+	$(INSTALL_DATA) $(srcdir)/demo.the     $(datadir)/THE/demo.the
+	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(datadir)/THE/THE_Help.txt
 
 clean:
 	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new config.log config.cache config.status
