--- Makefile.orig	2010-10-10 15:56:56.000000000 -0700
+++ Makefile	2012-04-11 22:30:19.000000000 -0700
@@ -41,7 +41,7 @@
 ELISP_EXTRAS=isar/interface isar/isartags
 EXTRA_DIRS = images
 
-DOC_FILES=AUTHORS BUGS COMPATIBILITY CHANGES COPYING INSTALL README REGISTER doc/*.pdf
+DOC_FILES=AUTHORS BUGS COMPATIBILITY CHANGES COPYING INSTALL README REGISTER
 DOC_EXAMPLES=acl2/*.acl2 hol98/*.sml isar/*.thy lclam/*.lcm lego/*.l pgshell/*.pgsh phox/*.phx plastic/*.lf twelf/*.elf
 DOC_SUBDIRS=${DOC_EXAMPLES} */README* */CHANGES */BUGS 
 
@@ -135,22 +135,23 @@
 MANDIR=${PREFIX}/share/man/man1
 INFODIR=${PREFIX}/share/info
 
-install: install-desktop install-elisp install-bin install-init
+install: install-desktop install-elisp install-bin install-init ${INSTALLDOC}
 
 install-desktop:
-	mkdir -p ${DESKTOP}/icons/hicolor/16x16
-	cp etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16
-	mkdir -p ${DESKTOP}/icons/hicolor/32x32
-	cp etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32
-	mkdir -p ${DESKTOP}/icons/hicolor/48x48
-	cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48
-	mkdir -p ${DESKTOP}/pixmaps
-	cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps
-	mkdir -p ${DESKTOP}/applications
-	cp etc/desktop/proofgeneral.desktop ${DESKTOP}/applications
-	mkdir -p ${DESKTOP}/mime-info
-	cp etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info
-	cp etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info
+	for f in 16x16 32x32 48x48; do \
+		if [ ! -d "${DESKTOP}/icons/hicolor/$$f" ]; then \
+			mkdir -p ${DESKTOP}/icons/hicolor/$$f; \
+		fi; \
+	done
+	${BSD_INSTALL_DATA} etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16/
+	${BSD_INSTALL_DATA} etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32/
+	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48/
+	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps/
+	${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/applications
+	if [ ! -d ${DESKTOP}/mime-info ]; then mkdir ${DESKTOP}/mime-info; fi
+	${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info/
+	${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info/
+
 # backwards compatibility with old linuxes
 	mkdir -p ${DESKTOP}/application-registry
 	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
@@ -168,15 +169,23 @@
 install-el:
 	mkdir -p ${ELISP}
 	for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done
-	for f in ${ELISP_DIRS}; do cp -pf $$f/*.el ${ELISP}/$$f; done
-	for f in ${EXTRA_DIRS}; do cp -prf $$f/* ${ELISP}/$$f; done
-	for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done
+	for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.el ${ELISP}/$$f; done
+	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done
+	for f in ${EXTRA_DIRS}; \
+		do for g in `find -d $$f -type d`; \
+		   do mkdir -p ${ELISP}/$$g; \
+		      files=`find $$g -depth 1 -type f \\! -perm +u+x`; \
+		      if [ "$$files" != "" ]; then ${BSD_INSTALL_DATA} $$files ${ELISP}/$$g; fi; \
+		      scripts=`find $$g -depth 1 -type f -perm +u+x`; \
+		      if [ "$$scripts" != "" ]; then ${BSD_INSTALL_SCRIPT} $$scripts ${ELISP}/$$g; fi; \
+		   done; \
+	    done
 
 install-elc: compile
 	mkdir -p ${ELISP}
 	for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done
-	for f in ${ELISP_DIRS}; do cp -pf $$f/*.elc ${ELISP}/$$f; done
-	for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done
+	for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.elc ${ELISP}/$$f; done
+	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done
 
 install-init:
 	mkdir -p ${ELISP_START}
@@ -186,18 +195,23 @@
 
 install-bin: scripts
 	mkdir -p ${BINDIR}
-	cp -pf ${BIN_SCRIPTS} ${BINDIR}
+	${BSD_INSTALL_SCRIPT} ${BIN_SCRIPTS} ${BINDIR}
 
-install-doc: doc.info doc.pdf
+install-doc: doc.html
 	mkdir -p ${MANDIR}
-	cp -pf doc/proofgeneral.1 ${MANDIR}
-	mkdir -p ${INFODIR}
-	cp -pf doc/*.info ${INFODIR}
-	/sbin/install-info ${INFODIR}/ProofGeneral.info* ${INFODIR}/dir
-	/sbin/install-info ${INFODIR}/PG-adapting.info* ${INFODIR}/dir
+	${BSD_INSTALL_MAN} doc/proofgeneral.1 ${MANDIR}
+	${BSD_INSTALL_MAN} doc/PG-adapting.info ${INFODIR}
+	${BSD_INSTALL_MAN} doc/ProofGeneral.info ${INFODIR}
 	mkdir -p ${DOCDIR}
-	for f in ${DOC_FILES}; do cp -pf $$f ${DOCDIR}; done
-	for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; cp -pf $$f ${DOCDIR}/$$f; done
+	for f in ${DOC_FILES}; do ${BSD_INSTALL_MAN} $$f ${DOCDIR}; done
+	for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; \
+		${BSD_INSTALL_MAN} $$f ${DOCDIR}/$$f; done
+	mkdir -p ${DOCDIR}/ProofGeneral
+	for f in doc/ProofGeneral/*.html; do \
+		${BSD_INSTALL_MAN} $$f ${DOCDIR}/ProofGeneral/`basename $$f`; done
+	mkdir -p ${DOCDIR}/PG-adapting
+	for f in doc/PG-adapting/*.html; do \
+		${BSD_INSTALL_MAN} $$f ${DOCDIR}/PG-adapting/`basename $$f`; done
 
 doc: FORCE
 	(cd doc; $(MAKE) EMACS=$(EMACS) $*)