Cleanup makefiles

2 files changed, 16 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index b67ae14e..e89d62f7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 
 # Set this to "emacs" or "xemacs" according to your version of Emacs.
 # NB: this is also used to set default install path names below.
-EMACS=$(shell if [ -z "`which xemacs`"]; then echo emacs; else echo xemacs; fi)
+EMACS=$(shell if [ -z "`which xemacs`" ]; then echo emacs; else echo xemacs; fi)
 
 # We default to /usr rather than /usr/local because installs of
 # desktop and doc files under /usr/local are unlikely to work with
@@ -203,7 +203,10 @@ install-doc: doc.info
 	/sbin/install-info ${INFODIR}/ProofGeneral.info* ${INFODIR}/dir
 	/sbin/install-info ${INFODIR}/PG-adapting.info* ${INFODIR}/dir
 
-doc.%: 
+doc: FORCE
+	(cd doc; make $*)
+
+doc.%: FORCE
 	(cd doc; make $*)
 
 ##
@@ -238,30 +241,22 @@ perlscripts:
 # FIXME: this next edit is really for install case, shouldn't be made
 # just when user types 'make'
 pgscripts:
-	@(pghome=${DEST_ELISP}; \
-	 for i in $(PG_SCRIPTS); do \
-	   sed "s|PGHOMEDEFAULT=.*$$|PGHOMEDEFAULT=$$pghome|" < $$i > .tmp \
+	@(for i in $(PG_SCRIPTS); do \
+	   sed "s|PGHOMEDEFAULT=.*$$|PGHOMEDEFAULT=${DEST_ELISP}|" < $$i > .tmp \
 	   && cat .tmp > $$i; \
 	 done; \
 	 rm -f .tmp)
 
 # Set PGHOME path in scripts back to default location.
 cleanpgscripts:
-	make pgscripts DEST_ELISP='$$$$HOME/ProofGeneral'
-
-
-##
-## This special target lets us use targets defined 
-## in developer's makefile Makefile.devel conveniently,
-## via make devel.<target>
-##
-
-devel.%:
-	make -f Makefile.devel $*
+	@(for i in $(PG_SCRIPTS); do \
+	   sed "s|PGHOMEDEFAULT=.*$$|PGHOMEDEFAULT=\$$HOME/ProofGeneral|" < $$i > .tmp \
+	   && cat .tmp > $$i; \
+	 done; \
+	 rm -f .tmp)
 
 ##
-## Similarly for xemacs Makefile.
+## Include developer's makefile if it exists here.
 ##
 
-xemacs.%:
-	make -f Makefile.xemacs $*
+-include Makefile.devel
diff --git a/Makefile.devel b/Makefile.devel
index 8028be1c..33f42ce5 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -224,11 +224,6 @@ BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (list "$(PWD)/generic" "
 EL=$(shell for f in $(ELISP_DIRS); do ls $$f/*.el; done)
 ELC=$(EL:.el=.elc)
 
-.SUFFIXES:	.el .elc
-
-.el.elc:
-	$(BYTECOMP) $*.el
-
 %.gz:	%
 	gzip -f $*
 
@@ -280,10 +275,8 @@ logupdate:  ChangeLog.gz
 #
 # Clean up intermediate files 
 #
-clean:	
+devclean: FORCE
 	@echo "***** CLEANING UP INTERMEDIATE FILES ****"
-	(cd doc; $(MAKE) clean)
-	(cd images; $(MAKE) clean)
 	rm -f doc/ProofGeneralPortrait.eps.gz
 	rm -f $(HTMLDIR)/ProofGeneral
 
@@ -294,7 +287,7 @@ clean:
 # Clean up intermediate files, all generated files 
 #  and Emacs backups, CVS temps
 #
-distclean:	clean
+distclean: devclean clean
 	@echo "***** CLEANING UP ALL JUNK FILES ****"
 	find . \( -name '*~' -o -name '#*#' -o -name '\.\#*' \) -print | xargs rm -f
 	(cd doc; $(MAKE) distclean)