Cleanup manual and regenerate use-package.texi

.gitignore

@@ -1,5 +1,12 @@
-/use-package.info
 *~
-*.elc
+/*-autoloads.el
+/*.elc
+/*.html
+/*.info
+/*.pdf
+/*.texi
+/config.mk
 /dir
 /doc/content/*
+/stats/
+/use-package/

Makefile

@@ -64,8 +64,6 @@ help:
 	$(info make preview-manuals  - preview manuals)
 	$(info make publish-manuals  - publish manuals)
 	$(info make dist             - create tarballs)
-	$(info make bump-versions    - bump versions for release)
-	$(info make bump-snapshots   - bump versions after release)
 	@printf "\n"
 
 ## Build #############################################################
@@ -175,26 +173,3 @@ use-package-$(VERSION).tar.gz: lisp info
 	@$(CP) $(DIST_ROOT_FILES) use-package-$(VERSION)
 	@$(TAR) cz --mtime=./use-package-$(VERSION) -f use-package-$(VERSION).tar.gz use-package-$(VERSION)
 	@$(RMDIR) use-package-$(VERSION)
-
-define set_manual_version
-(let ((version (split-string "$(USE_PACKAGE_VERSION)" "\\.")))
-  (setq version (concat (car version) "." (cadr version)))
-  (dolist (file (list "use-package"))
-    (with-current-buffer (find-file-noselect (format "%s.org" file))
-      (goto-char (point-min))
-      (re-search-forward "^#\\+SUBTITLE: for version ")
-      (delete-region (point) (line-end-position))
-      (insert version)
-      (save-buffer))))
-endef
-export set_manual_version
-
-bump-versions: bump-versions-1 texi
-bump-versions-1:
-	@$(BATCH) --eval "(progn\
-        $$set_manual_version)"
-
-bump-snapshots:
-	@$(BATCH) --eval "(progn\
-        $$set_package_requires)"
-	git commit -a -m "Reset Package-Requires for Melpa"

Makefile.doc

@@ -59,14 +59,12 @@ clean:
 # use "%.texi: %.org".  Instead we have to hardcode each file
 # using a shared target.
 
-DOC_ARGS  = --batch -Q $(DOC_LOAD_PATH)
-DOC_ARGS += -l ox-extra -l ol-man -l ox-texinfo+.el
-DOC_EVAL  = --eval "(ox-extras-activate '(ignore-headlines))"
-DOC_EVAL += -f org-texinfo-export-to-texinfo
+ORG_ARGS = --batch -Q $(DOC_LOAD_PATH)
+ORG_EVAL = --funcall org-texinfo-export-to-texinfo
 
 texi:
 	@printf "Generating use-package.texi\n"
-	@$(EMACSBIN) $(DOC_ARGS) use-package.org $(DOC_EVAL)
+	@$(EMACSBIN) $(ORG_ARGS) use-package.org $(ORG_EVAL)
 	@echo >> use-package.texi
 
 stats:

default.mk

@@ -90,7 +90,4 @@ LOAD_PATH = -L $(TOP)
 
 endif # ifndef LOAD_PATH
 
-DOC_LOAD_PATH ?= $(LOAD_PATH) \
-    -L $(HOME)/emacs/site-lisp \
-    -L $(HOME)/emacs/site-lisp/ox-texinfo-plus \
-    -L $(HOME)/emacs/site-lisp/org-mode/contrib/lisp
+DOC_LOAD_PATH ?= $(LOAD_PATH) -L $(HOME)/emacs/site-lisp