tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-08-26 20:20:45 +02:00
parent 6c9a6ae8d1 72a2df1aee
commit 140bf0fb81
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org-compat.el
View File

@ -442,6 +442,7 @@ With two arguments, return floor and remainder of their quotient."
'condition-case-no-debug) 'condition-case-no-debug)
'condition-case)) 'condition-case))
;;;###autoload
(defmacro org-check-version () (defmacro org-check-version ()
"Try very hard to provide sensible version strings." "Try very hard to provide sensible version strings."
(let* ((org-dir (org-find-library-dir "org")) (let* ((org-dir (org-find-library-dir "org"))

18
mk/server.mk
View File

@ -12,14 +12,26 @@ help helpall helpserver::
$(info ) $(info )
$(info Maintenance) $(info Maintenance)
$(info ===========) $(info ===========)
$(info release - clean up and create distribution archives) $(info release - clean up, create the distribution archives)
$(info elpa - clean up and create ELPA archive) $(info upload-release - clean up, populate the server with arhives)
$(info upload - clean up and populate server directories) $(info )
$(info elpa - clean up, create the ELPA archive)
$(info upload-elpa - clean up, populate the server with ELPA)
$(info )
$(info upload - clean up, populate the server with everything)
$(info upload-doc - clean up, populate the server with docs)
helpserver:: helpserver::
@echo "" @echo ""
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# no slash / at the end
SERVROOT = /var/www/orgmode.org
SERVERMK = true # or just any value at all, really
#----------------------------------------------------------------------
ORGCOMM = README request-assign-future.txt lisp/ doc/ ORGCOMM = README request-assign-future.txt lisp/ doc/
ORGFULL = $(ORGCOMM) Makefile \ ORGFULL = $(ORGCOMM) Makefile \
mk/default.mk mk/targets.mk mk/version.mk \ mk/default.mk mk/targets.mk mk/version.mk \