From 37e863b4eaaf8e1c45fdb67a93c3c07fe181a0b1 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Wed, 21 Sep 2005 23:14:14 +0000 Subject: Select EMACS based on xemacs if available, otherwise emacs --- Makefile.devel | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'Makefile.devel') diff --git a/Makefile.devel b/Makefile.devel index a33d634d..eb1e307f 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -152,11 +152,13 @@ CVSNAME = ProofGeneral # make clean in a non cvs directory. CVSROOT=$(shell cat CVS/Root) +# Default emacs for compiling/testing +EMACS=$(shell if [ -z "`which xemacs`"]; then echo emacs; else echo xemacs; fi) + # Emacs for batch compiling -BATCHEMACS=xemacs -batch -q -no-site-file +BATCHEMACS=$(EMACS) -batch -q -no-site-file # Emacs for interactive use in testing -EMACS=emacs EMACSFLAGS=-q -no-site-file # GNU version of tar, please @@ -192,6 +194,9 @@ RPMTOPDIR=/tmp/$(NAME)-rpm # RPMBUILD=rpmbuild --rcfile $(RPMRC) RPMBUILD=rpmbuild --define '_topdir $(RPMTOPDIR)' +# Temporary dmg root for building Mac OS X 10.4 disk image files. +DMGTOPDIR=/tmp/$(NAME)-dmg + RELEASENAMETAR = $(RELEASENAME).tar RELEASENAMETARGZ = $(RELEASENAMETAR).gz RELEASENAMEZIP = $(RELEASENAME).zip @@ -497,6 +502,21 @@ rpm: rpmrelease: rpm cp -pf $(RPMTOPDIR)/RPMS/noarch/* $(RELEASEDIR) +############################################################ +## +## dmg: +## Build a Mac OS X dmg disk image file from the recently made +## distribution using the tarball. +## +## +dmg: + rm -rf $(DMGTOPDIR) + hdiutil create -srcfolder $(DISTBUILDIR) + mkdir -p $(RPMTOPDIR)/SPECS + mkdir -p $(RPMTOPDIR)/SOURCES + mkdir -p $(RPMTOPDIR)/BUILD + $(RPMBUILD) -tb $(DISTBUILDIR)/$(RELEASENAMETARGZ) + ############################################################ ## ## releaseclean: @@ -555,7 +575,7 @@ distall: distclean tag dist distinstall releaseclean # distinstall: # Install distribution from $(DISTBUILDIR) into DISTINSTALLDIR # Clean out DISTINSTALLDIR first. -# NB! Simple install, no attempt to put info files, etc, in +### NB! Simple install, no attempt to put info files, etc, in # special places. # distinstall: -- cgit v1.2.3