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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-26 18:27:45 +02:00
parent 5dc2f6ab37 a1e645b2be
commit 4fd173a187
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/server.mk
View File

@ -71,7 +71,7 @@ elpa-dirty:
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-pkg.el -@$(RM) $(ORGDIR) org-pkg.el
elpa-up: info card elpa-dirty archive-contents elpa-up: info card elpa-dirty archive-contents
$(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/pkg/daily/
archive-contents: archive-contents:
echo -e "(1 (org . [($(PKG_TAG)) nil \"$(PKG_DOC)\"])\n" > $@ \ echo -e "(1 (org . [($(PKG_TAG)) nil \"$(PKG_DOC)\"])\n" > $@ \
@ -91,7 +91,7 @@ elpaplus-dirty:
-@$(RM) $(ORGDIR) org-plus-contrib-pkg.el -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el
@$(MAKE) cleanlisp @$(MAKE) cleanlisp
elpaplus-up: info card elpaplus-dirty archive-contents elpaplus-up: info card elpaplus-dirty archive-contents
$(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/pkg/daily/
tagwarn: tagwarn:
$(if $(filter-out $(ORGVERSION), $(GITVERSION)), \ $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \