summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-09-15 20:06:53 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2012-09-15 20:06:53 +0200
commitf1f1fc8d48171659be7130453596ae7567ab874d (patch)
tree972018e8d7333af43f12c9e64d38174ed9eb18fa
parent950789d26afe6b64995ba8f62cbce4f6a79511be (diff)
downloadorg-mode-f1f1fc8d48171659be7130453596ae7567ab874d.tar.gz
mk/server.mk: fix previous commit
-rw-r--r--mk/server.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/server.mk b/mk/server.mk
index 301c502..a2d49f4 100644
--- a/mk/server.mk
+++ b/mk/server.mk
@@ -62,11 +62,11 @@ elpa-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
- echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
- > orgplus-pkg.el
+ 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, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
- -@$(RM) $(ORGDIR) orgplus-pkg.el
+ $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
+ -@$(RM) $(ORGDIR) org-pkg.el
elpa-up: info card elpa-dirty
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
@@ -78,11 +78,11 @@ elpaplus-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
- echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
- > org-pkg.el
+ 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, $(ORGELPA), $(ORGDIR)/$(dist))
- -@$(RM) $(ORGDIR) org-pkg.el
+ $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
+ -@$(RM) $(ORGDIR) orgplus-pkg.el
@$(MAKE) cleanlisp
elpaplus-up: info card elpaplus-dirty
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/