diff options
author | David Aspinall <da@inf.ed.ac.uk> | 2009-03-10 10:32:31 +0000 |
---|---|---|
committer | David Aspinall <da@inf.ed.ac.uk> | 2009-03-10 10:32:31 +0000 |
commit | 777dc33ca65659208a5ed37e33ad4127ea087436 (patch) | |
tree | a39dfb24991b11d256794411865f196c99414008 | |
parent | 91f51adb9c336cc9255152063fbc5d2baf00e1c5 (diff) |
Fix to use in place of make, see http://proofgeneral.inf.ed.ac.uk/trac/ticket/262
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | Makefile.devel | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -79,7 +79,7 @@ compile: $(EL) @echo "****************************************************************" @echo " Byte compiling... " @echo "****************************************************************" - make elc + $(MAKE) elc @echo "****************************************************************" @echo " Finished." @echo "****************************************************************" @@ -109,7 +109,7 @@ all: compile scripts ## Remove generated targets ## clean: cleanpgscripts - rm -f $(ELC) *~ */*~ .\#* */.\#* .byte-compile + rm -f $(ELC) *~ */*~ .\#* */.\#* (cd doc; $(MAKE) clean) distclean: clean @@ -199,10 +199,10 @@ install-doc: doc.info doc.pdf for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; cp -pf $$f ${DOCDIR}/$$f; done doc: FORCE - (cd doc; make EMACS=$(EMACS) $*) + (cd doc; $(MAKE) EMACS=$(EMACS) $*) doc.%: FORCE - (cd doc; make EMACS=$(EMACS) $*) + (cd doc; $(MAKE) EMACS=$(EMACS) $*) ## ## scripts: try to patch bash and perl scripts with correct paths diff --git a/Makefile.devel b/Makefile.devel index 5062c597..fac2333f 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -505,7 +505,7 @@ releaseall: release releaseclean golive ## golive: $(GOLIVE) - cd $(HTMLDIR); for f in $(DOWNLOADHTMLS); do make pub.$$f; done; + cd $(HTMLDIR); for f in $(DOWNLOADHTMLS); do $(MAKE) pub.$$f; done; rm -rf $(RELEASEDIR) |