Merge branch 'maint'

.gitignore

@@ -34,6 +34,7 @@ org-install.el
 org-version.el
 doc/org-version.inc
 org-*.tar*
+orgplus-*.tar*
 org-*.zip
 version.mk
 manual

mk/server.mk

@@ -69,6 +69,23 @@ elpa-dirty:
 elpa-up:	info card elpa-dirty
 	$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
 
+
+elpaplus:		cleanall info card elpaplus-dirty
+elpaplus-dirty elpaplus-up:	ORG_ADD_CONTRIB=org-*
+elpaplus-dirty elpaplus-up:	ORGDIR=orgplus-$(PKG_TAG)
+elpaplus-dirty:
+	@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus 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 --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
+	  $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
+	-@$(RM) $(ORGDIR) org-pkg.el
+	@$(MAKE) cleanlisp
+elpaplus-up:	info card elpaplus-dirty
+	$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
+
 tagwarn:
 	$(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
 	  $(info  ======================================================) \
@@ -93,7 +110,8 @@ doc-up:	info pdf card html
 	$(CP) doc/manual/* $(SERVROOT)/manual
 	$(CP) doc/guide/*  $(SERVROOT)/guide
 
-upload:		cleanall elpa-up rel-up doc-up
-upload-elpa:	cleanall elpa-up
-upload-release:	cleanall rel-up
-upload-doc:	cleanall doc-up
+upload:			cleanall elpa-up rel-up doc-up elpaplus-up
+upload-elpa:		cleanall elpa-up
+upload-elpaplus:	cleanall elpaplus-up
+upload-release:		cleanall rel-up
+upload-doc:		cleanall doc-up

mk/targets.mk

@@ -10,13 +10,6 @@ SUBDIRS       = $(OTHERDIRS) $(LISPDIRS)
 INSTSUB       = $(SUBDIRS:%=install-%)
 ORG_MAKE_DOC ?= info html pdf
 
-ORG_FROM_CONTRIB = $(wildcard \
-			$(addsuffix .el, \
-			$(addprefix contrib/lisp/, \
-			$(basename \
-			$(notdir $(ORG_ADD_CONTRIB))))))
-ORG_TO_LISP      = $(ORG_FROM_CONTRIB:contrib/%=%)
-
 ifneq ($(wildcard .git),)
   GITVERSION ?= $(shell git describe --abbrev=6 HEAD)
   ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD))
@@ -53,8 +46,12 @@ config config-all::
 	$(foreach var,$(CONF_BASE),$(info $(var)	= $($(var))$(EOL)))
 	$(foreach var,$(CONF_DEST),$(info $(var)	= $(DESTDIR)$($(var))$(EOL)))
 	$(info ========= Additional files from contrib/lisp)
-	$(info ORG_FROM_CONTRIB =)
-	$(info $(ORG_TO_LISP:lisp/%=%))
+	$(info $(notdir \
+		$(wildcard \
+		$(addsuffix .el, \
+		$(addprefix contrib/lisp/, \
+		$(basename \
+		$(notdir $(ORG_ADD_CONTRIB))))))))
 config-test config-all::
 	$(info )
 	$(info ========= Test configuration)
@@ -89,9 +86,6 @@ local.mk:
 	-@$(MAKE_LOCAL_MK)
 
 all compile::
-ifneq ($(ORG_FROM_CONTRIB),)
-	$(CP) $(ORG_FROM_CONTRIB) lisp/
-endif
 	$(foreach dir, doc lisp, $(MAKE) -C $(dir) clean;)
 compile compile-dirty::
 	$(MAKE) -C lisp $@
@@ -127,6 +121,13 @@ $(INSTSUB):
 	$(MAKE) -C $(@:install-%=%) install
 
 autoloads: lisp
+ifneq ($(ORG_ADD_CONTRIB),)
+	$(CP) $(wildcard \
+		$(addsuffix .el, \
+		$(addprefix contrib/lisp/, \
+		$(basename \
+		$(notdir $(ORG_ADD_CONTRIB)))))) lisp/
+endif
 	$(MAKE) -C $< $@
 
 cleandirs:
@@ -134,22 +135,20 @@ cleandirs:
 
 clean:	cleanlisp cleandoc
 
-cleanall: cleandirs cleantest
+cleanall: cleandirs cleantest cleanaddcontrib
 	-$(FIND) . \( -name \*~ -o -name \*# -o -name .#\* \) -exec $(RM) {} \;
 	-$(FIND) $(CLEANDIRS) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} \;
 
 $(CLEANDIRS:%=clean%):
 	-$(FIND) $(@:clean%=%) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} \;
 
-ifneq ($(ORG_TO_LISP),)
-cleanlisp:	cleanaddcontrib
-cleanaddcontrib:
-	$(RM) $(ORG_TO_LISP)
-endif
-
 cleanelc:
 	$(MAKE) -C lisp $@
 
+cleanaddcontrib:
+	-$(RM) $(wildcard $(addprefix lisp/,$(notdir $(wildcard contrib/lisp/*.el))))
+
+cleanlisp:	cleanaddcontrib
 cleanlisp cleandoc:
 	$(MAKE) -C $(@:clean%=%) clean