diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-09-27 23:50:02 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-09-27 23:50:02 +0200 |
| commit | 92c8cd487dae0f00ad69c0c75bbc9d48153d73de (patch) | |
| tree | 885013fabddf30afe2bbc7dfd81080b0a897d31e | |
| parent | b0c5030c8566e10af41543e8b52c0bdc1b01ea88 (diff) | |
| parent | 418ec0f5e7be3cda66b05c63d60c6633a244c587 (diff) | |
| download | org-mode-92c8cd487dae0f00ad69c0c75bbc9d48153d73de.tar.gz | |
Merge branch 'maint' of orgmode.org:org-mode into maint
| -rw-r--r-- | mk/server.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mk/server.mk b/mk/server.mk index ae91dae..7cdae55 100644 --- a/mk/server.mk +++ b/mk/server.mk @@ -65,17 +65,19 @@ elpa-dirty: @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) ln -s . $(ORGDIR) - echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ - > org-pkg.el - tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ + echo "(define-package \"org\"" > org-pkg.el + echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-pkg.el + echo ";; no-byte-compile: t" >> org-pkg.el + tar --exclude=Makefile --exclude="org-colview-xemacs.el" \ + --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) -@$(RM) $(ORGDIR) org-pkg.el elpa-up: info card elpa-dirty archive-contents $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/pkg/daily/ archive-contents: - echo "(1 (org . [($(PKG_TAG)) nil \"$(PKG_DOC)\"])\n" > $@ \ - " (org-plus-contrib . [($(PKG_TAG)) nil \"$(PKG_DOC)\"]))" >> $@ + echo "(1 (org . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar])" > $@ + echo " (org-plus-contrib . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar]))" >> $@ elpaplus: cleanall info card elpaplus-dirty elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-* @@ -84,9 +86,11 @@ elpaplus-dirty: @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) ln -s . $(ORGDIR) - echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ - > org-plus-contrib-pkg.el - tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ + echo "(define-package \"org-plus-contrib\"" > org-plus-contrib-pkg.el + echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-plus-contrib-pkg.el + echo ";; no-byte-compile: t" >> org-plus-contrib-pkg.el + tar --exclude=Makefile --exclude="org-colview-xemacs.el" \ + --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el @$(MAKE) cleanlisp |