ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: Use ${MAKE} instead of "make" 

Proposal by Friedrich Delgado Friedrichs
This commit is contained in:
Carsten Dominik 2009-06-02 14:15:00 +02:00
parent ee4bcda0e9
commit 36caef0fc0
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Makefile
View File

@ -122,14 +122,13 @@ default: $(ELCFILES)
all: $(ELCFILES) $(INFOFILES) all: $(ELCFILES) $(INFOFILES)
up2: up2: update
make update sudo ${MAKE} install
sudo make install
update: update:
git pull git pull
make clean ${MAKE} clean
make all ${MAKE} all
compile: $(ELCFILES0) compile: $(ELCFILES0)
@ -138,10 +137,10 @@ install: install-lisp
doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf
p: p:
make pdf && open doc/org.pdf ${MAKE} pdf && open doc/org.pdf
c: c:
make card && gv doc/orgcard.ps ${MAKE} card && gv doc/orgcard.ps
install-lisp: $(LISPFILES) $(ELCFILES) install-lisp: $(LISPFILES) $(ELCFILES)
if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ; if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
@ -224,10 +223,10 @@ card: doc/orgcard.pdf doc/orgcard.ps doc/orgcard_letter.pdf doc/orgcard_letter.p
distfile: distfile:
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
touch doc/org.texi doc/orgcard.tex # force update touch doc/org.texi doc/orgcard.tex # force update
make cleancontrib ${MAKE} cleancontrib
make info ${MAKE} info
make doc ${MAKE} doc
make lisp/org-install.el ${MAKE} lisp/org-install.el
rm -rf org-$(TAG) org-$(TAG).zip rm -rf org-$(TAG) org-$(TAG).zip
$(MKDIR) org-$(TAG) $(MKDIR) org-$(TAG)
$(MKDIR) org-$(TAG)/xemacs $(MKDIR) org-$(TAG)/xemacs
@ -244,10 +243,10 @@ distfile:
release: release:
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
make distfile ${MAKE} distfile
make doc ${MAKE} doc
UTILITIES/gplmanual.pl UTILITIES/gplmanual.pl
make html_manual ${MAKE} html_manual
rm -rf RELEASEDIR rm -rf RELEASEDIR
$(MKDIR) RELEASEDIR $(MKDIR) RELEASEDIR
cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR
@ -262,19 +261,19 @@ upload_manual:
rsync -avuz --delete doc/manual/ cdominik@orgmode.org:orgmode.org/manual/ rsync -avuz --delete doc/manual/ cdominik@orgmode.org:orgmode.org/manual/
snap: snap:
make release TAG=snapshot ${MAKE} release TAG=snapshot
scp RELEASEDIR/org-snapshot.zip cdominik@orgmode.org:orgmode.org/ scp RELEASEDIR/org-snapshot.zip cdominik@orgmode.org:orgmode.org/
scp RELEASEDIR/org-snapshot.tar.gz cdominik@orgmode.org:orgmode.org/ scp RELEASEDIR/org-snapshot.tar.gz cdominik@orgmode.org:orgmode.org/
make cleanrel ${MAKE} cleanrel
relup0: relup0:
make release ${MAKE} release
make upload_release ${MAKE} upload_release
relup: relup:
make release ${MAKE} release
make upload_release ${MAKE} upload_release
make upload_manual ${MAKE} upload_manual
db: db:
grep -e '(debug)' lisp/*el grep -e '(debug)' lisp/*el
@ -297,13 +296,13 @@ cleanrel:
rm -rf org-6*zip org-6*tar.gz org-snapshot* rm -rf org-6*zip org-6*tar.gz org-snapshot*
clean: clean:
make cleanelc ${MAKE} cleanelc
make cleandoc ${MAKE} cleandoc
make cleanrel ${MAKE} cleanrel
rm -f *~ */*~ */*/*~ rm -f *~ */*~ */*/*~
cleanall: cleanall:
make clean ${MAKE} clean
rm -f lisp/org-install.el rm -f lisp/org-install.el
.el.elc: .el.elc: