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

Revert "remove explicit nil requirements from elpa packages" 

This reverts commit ef125abe61.

This was committed to the wrong branch and deletes a variable that
should be kept.  Will be re-done differently from maint.
This commit is contained in:
Achim Gratz 2012-09-18 21:28:27 +02:00
parent 4600e9eca8
commit 6f2b04f6da
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mk/server.mk
View File

@ -54,6 +54,7 @@ rel-up: info pdf card rel-dirty
PKG_TAG = $(shell date +%Y%m%d)
PKG_DOC = "Outline-based notes management and organizer"
PKG_REQ = "nil"
elpa: cleanall info card elpa-dirty
elpa-dirty elpa-up: ORGDIR=org-$(PKG_TAG)
@ -61,7 +62,7 @@ elpa-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\")" \
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
@ -77,7 +78,7 @@ elpaplus-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\")" \
echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> orgplus-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))