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

README

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

README_ELPA

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

README_contribute

@@ -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
 to GNU Emacs bzr repository.  The final decision about this rests
 with the maintainer.
-

mk/server.mk

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