1 files changed, 23 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 032cf9b..2dc72eb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,18 @@ NAME  = ekdosis
 SHELL = bash
 CMP   = lualatex-dev
 PWD   = $(shell pwd)
-VERS  = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
+#VERS  = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
+VERS := $(shell typeoutfileinfo $(NAME).dtx | egrep -o '\+.*$$' | awk '{ print $$6 }' | sed -e 's/^v//')
 LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
 UTREE = $(shell kpsewhich --var-value TEXMFHOME)
 HOMEDIR := $$HOME
 SAMPLES := samples
 
 exts := md html ins dtx el
+files := AUTHORS.md LICENSE
+zfiles := {AUTHORS.md,LICENSE}
 findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)")
+findfiles := $(foreach file,$(files), -or -iname "$(file)")
 
 define do_documentation
         $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx >/dev/null
@@ -47,11 +51,11 @@ samples: clean sty
 
 clean: testsamples
         @ echo "Cleaning $(NAME) directory"
-        rm -rf auto
         rm -f $(NAME).bib $(PWD)/TMP/*.bib
         rm -rf .backup
-        find -iname "*~" -or -iname "*.pdf" -or -iname "*_out*.tex" | xargs rm -rf
-        find ./* -type f -iname "Makefile" $(findopts) > ls-R
+        rm -rf auto
+        find ./ -iname "*~" -or -iname "*.pdf" -or -iname "*_out*.tex" | xargs rm -rf
+        find ./* -type f -iname "Makefile" $(findopts) $(findfiles) > ls-R
         find ./* -type f -iname "*.tex" | grep '/samples/' >> ls-R
         rsync -aPr --files-from=ls-R . .backup
         rm -rf *
@@ -59,19 +63,20 @@ clean: testsamples
         rm -rf .backup
 
 pandoc:
-        pandoc -s README.md -o about.html
+        pandoc README.md -o about.html
 
 auctex:
-        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
-        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        emacs --batch -f batch-byte-compile ekdosis.el &>/dev/null
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(NAME)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(NAME)*.{el,elc} $(HOMEDIR)/.emacs.d/auctex/style
 
 distclean: clean uninst
 
 uninst:
         rm -rf $(UTREE)/{tex,source,doc}/lualatex/$(NAME)
-        rm -rf $(HOMEDIR)/.emacs.d/auctex/auto/$(NAME).{el,elc}
+        rm -rf $(HOMEDIR)/.emacs.d/auctex/style/$(NAME).{el,elc}
 
 inst: uninst auctex all
         @ echo "Installing $(NAME) locally"
@@ -79,7 +84,7 @@ inst: uninst auctex all
         cp $(NAME).dtx $(UTREE)/source/lualatex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)
-        cp $(NAME).pdf $(UTREE)/doc/lualatex/$(NAME)
+        cp $(NAME).pdf $(files) $(UTREE)/doc/lualatex/$(NAME)
         cp -r samples/ $(UTREE)/doc/lualatex/$(NAME)
         @ echo "Installation complete. Happy TeXing!"
 
@@ -88,14 +93,14 @@ local: uninst auctex
         mkdir -p $(UTREE)/{tex,source,doc}/lualatex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)
-        if [ -e "$(NAME).pdf" ]; then cp $(NAME).pdf $(UTREE)/doc/lualatex/$(NAME) &&\
+        if [ -e "$(NAME).pdf" ]; then cp $(NAME).pdf $(files) $(UTREE)/doc/lualatex/$(NAME) &&\
         cp -r $(SAMPLES)/ $(UTREE)/doc/lualatex/$(NAME); fi
 
 install: all
         sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
         sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
         sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME)
-        sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+        sudo cp $(NAME).pdf $(files) $(LOCAL)/doc/latex/$(NAME)
         cp -r $(SAMPLES)/ $(LOCAL)/doc/latex/$(NAME)
 
 uninstall:
@@ -103,9 +108,12 @@ uninstall:
 
 zip: all
         ln -sf . $(NAME)
-        zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{samples,README.md,$(NAME).{pdf,sty,lua,el}}
+        zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{$(zfiles),samples,README.md,$(NAME).{pdf,sty,lua,el}}
         rm $(NAME)
 
+hal: clean
+        zip -Drq $(PWD)/$(NAME)-$(VERS).zip *
+
 package: distclean all
         mkdir $(NAME)/
         cp Makefile README.md $(NAME).{ins,dtx,pdf,el} $(NAME)/
@@ -113,7 +121,7 @@ package: distclean all
         mkdir -p tex/lualatex/$(NAME)/
         cp *.lua *.sty tex/lualatex/$(NAME)/
         mkdir -p doc/lualatex/$(NAME)/
-        cp README.md *.el *.pdf doc/lualatex/$(NAME)/
+        cp $(files) README.md *.el *.pdf doc/lualatex/$(NAME)/
         cp -r samples/ doc/lualatex/$(NAME)/
         mkdir -p source/lualatex/$(NAME)/
         cp Makefile *.ins *.dtx source/lualatex/$(NAME)/
@@ -123,4 +131,4 @@ package: distclean all
         rm -rf $(NAME)/
 
 .SILENT: testsamples
-.PHONY: all clean distclean pandoc inst local uninst install uninstall zip package samples testsamples
+.PHONY: all clean distclean pandoc inst local uninst install uninstall zip hal package samples testsamples