--- Makefile.in.orig	Wed Feb  2 08:22:53 2000
+++ Makefile.in	Wed May  3 09:00:00 2000
@@ -7,13 +7,15 @@
 ##############################################################################
 #
 # XLSLIB -- directory for xlisp executable, startup, example, and help files
+# XLSLIBEXEC -- directory for xlisp executable and startup
 # BINDIR -- directory for xlispstat shell script
 #
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-XLSLIB=${prefix}/lib/xlispstat
+XLSLIB=${prefix}/share/xlispstat
+XLSLIBEXEC=${prefix}/libexec/xlispstat
 BINDIR=${exec_prefix}/bin
 
 SHELL = /bin/sh
@@ -33,7 +35,7 @@
 LIBS = ${EXTRALIBS} -lm
 
 xlispstat: setup.shell xlisp.wks
-	./setup.shell xlispstat ${XLSLIB}
+	./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC}
 	chmod a+x xlispstat
 
 xlisp.wks: xlisp ${LSPDIR}/xlisp.wks
@@ -46,24 +48,25 @@
 	rm -f xlisp
 	cp ${CDIR}/xlisp ./xlisp
 ${CDIR}/xlisp:
-	(cd ${CDIR}; make xlisp)
+	(cd ${CDIR}; ${MAKE} xlisp)
 
 install: installexecs installlsp
 
 installexecs: xlispstat xlisp installdirs
-	-cp xlispstat ${BINDIR}/xlispstat
-	-cp xlisp ${XLSLIB}
+	${BSD_INSTALL_SCRIPT} xlispstat ${BINDIR}/xlispstat
+	${BSD_INSTALL_PROGRAM} xlisp ${XLSLIBEXEC}
 
 installlsp: xlisp.wks xlisp.hlp installdirs
-	-cp xlisp.wks ${XLSLIB}
-	-cp xlisp.hlp ${XLSLIB}
-	-cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
-	-cp Data/*.lsp ${XLSLIB}/Data
-	-cp Examples/*.lsp ${XLSLIB}/Examples
+	${BSD_INSTALL_SCRIPT} xlisp.wks ${XLSLIBEXEC}
+	${BSD_INSTALL_DATA} xlisp.hlp ${XLSLIB}
+	${BSD_INSTALL_DATA} Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
+	${BSD_INSTALL_DATA} Data/*.lsp ${XLSLIB}/Data
+	${BSD_INSTALL_DATA} Examples/*.lsp ${XLSLIB}/Examples
 
 installdirs:
 	-mkdir -p ${BINDIR}
 	-mkdir -p ${XLSLIB}
+	-mkdir -p ${XLSLIBEXEC}
 	-mkdir ${XLSLIB}/Data
 	-mkdir ${XLSLIB}/Examples
 	-mkdir ${XLSLIB}/Autoload