Small fixes to the README files and to mk/server.mk

This commit is contained in:
Bastien Guerry 2012-09-22 10:32:46 +02:00
parent ae57da7d80
commit 51955a248d
6 changed files with 17 additions and 22 deletions

6
README
View File

@ -15,6 +15,9 @@ Makefile
instructions, see the manual or the more detailed procedure instructions, see the manual or the more detailed procedure
on Worg: http://orgmode.org/worg/dev/org-build-system.html on Worg: http://orgmode.org/worg/dev/org-build-system.html
mk/
Files needed for building Org.
lisp/ lisp/
Directory with all the Emacs Lisp files that make up Org. Directory with all the Emacs Lisp files that make up Org.
@ -29,9 +32,6 @@ contrib/
etc/ etc/
Files needed for the ODT exporter. Files needed for the ODT exporter.
mk/
Files needed for building Org.
testing/ testing/
Testing suite for Org. Testing suite for Org.

View File

@ -16,12 +16,12 @@ There are other ELPA online, offering more packages.
Some contain the org-plus-contrib-*.tar ELPA package, which bundles Some contain the org-plus-contrib-*.tar ELPA package, which bundles
the core Org files plus many additional contributed libraries. the core Org files plus many additional contributed libraries.
All ELPA version of Org contain: All ELPA packages of Org contain:
README_ELPA README_ELPA
This file. This file.
*el *.el
Elisp files. Elisp files.
org org

View File

@ -86,4 +86,3 @@ move the file into the Org-mode core. This means they will be
moved up to the root directory and will also eventually be added moved up to the root directory and will also eventually be added
to GNU Emacs bzr repository. The final decision about this rests to GNU Emacs bzr repository. The final decision about this rests
with the maintainer. with the maintainer.

View File

@ -31,17 +31,13 @@ SERVERMK ?= true # or just any value at all, really
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ORGREADMECOMM = README ORGFULL = README lisp/ \
ORGREADMEELPA = README_ELPA
ORGCOMM = lisp/
ORGFULL = $(ORGCOMM) $(ORGREADMECOMM) \
Makefile request-assign-future.txt \ Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \ mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \ mk/org-fixup.el \
etc/ contrib/ doc/ etc/ contrib/ doc/
ORGFULL := $(ORGFULL:%/=%/*) ORGFULL := $(ORGFULL:%/=%/*)
ORGELPA = $(ORGCOMM) $(ORGREADMEELPA) \ ORGELPA = README_ELPA lisp/ \
doc/dir doc/org doc/orgcard.pdf \ doc/dir doc/org doc/orgcard.pdf \
etc/styles/ org-pkg.el etc/styles/ org-pkg.el
ORGELPA := $(ORGELPA:%/=%/*) ORGELPA := $(ORGELPA:%/=%/*)
@ -71,7 +67,7 @@ elpa-dirty:
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-pkg.el > org-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(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 elpa-up: info card elpa-dirty
@ -87,7 +83,7 @@ elpaplus-dirty:
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-plus-contrib-pkg.el > org-plus-contrib-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-plus-contrib-pkg.el -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el
@$(MAKE) cleanlisp @$(MAKE) cleanlisp