From 6f2b04f6da23383fdf577f2600e93a3dec8c1ee2 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Tue, 18 Sep 2012 21:28:27 +0200 Subject: [PATCH] Revert "remove explicit nil requirements from elpa packages" This reverts commit ef125abe617eb75abf449458937136cb7a5568b6. This was committed to the wrong branch and deletes a variable that should be kept. Will be re-done differently from maint. --- mk/server.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/server.mk b/mk/server.mk index 9b9407ecc..a2d49f40c 100644 --- a/mk/server.mk +++ b/mk/server.mk @@ -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))