1 files changed, 20 insertions, 16 deletions

diff --git a/makefile b/makefile
index 900ae1d..d88512f 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,6 @@
 pkg := arabluatex
-ver  := $(shell ltxfileinfo -v $(pkg).dtx|sed -e 's/^v//')
+#VERS  := $(shell ltxfileinfo -v $(pkg).dtx|sed -e 's/^v//')
+VERS := $(shell typeoutfileinfo $(pkg).dtx | egrep -o '\+.*$$' | awk '{ print $$6 }' | sed -e 's/^v//')
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
 CMP = lualatex-dev
@@ -28,20 +29,20 @@ local: clean sty
         mkdir -p $(TEXMFDIR)/tex/lualatex/arabluatex; \
         fi
         cp $(pkg)*.{sty,lua} $(TEXMFDIR)/tex/lualatex/arabluatex
-        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
-        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
 
 inst: doc
         if [ ! -d "$(TEXMFDIR)/tex/lualatex/arabluatex" ]; then \
         mkdir -p $(TEXMFDIR)/tex/lualatex/arabluatex; \
         fi
         cp $(pkg)*.{sty,lua} $(TEXMFDIR)/tex/lualatex/arabluatex
-        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
-        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
         if [ ! -d "$(TEXMFDIR)/doc/lualatex/arabluatex" ]; then \
         mkdir -p $(TEXMFDIR)/doc/lualatex/arabluatex; \
         fi
@@ -49,16 +50,19 @@ inst: doc
         cp -r samples/ $(TEXMFDIR)/doc/lualatex/arabluatex
 
 auctex: clean
-        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/auto" ]; then \
-        mkdir -p $(HOMEDIR)/.emacs.d/auctex/auto; \
+        if [ ! -d "$(HOMEDIR)/.emacs.d/auctex/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
         fi
-        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/auto
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
 
 zip: all
         ln -sf . $(pkg)
-        zip -Drq $(PWD)/$(pkg)-$(ver).zip $(pkg)/{samples,README.md,$(pkg)*.{pdf,sty,lua,el}}
+        zip -Drq $(PWD)/$(pkg)-$(VERS).zip $(pkg)/{samples,README.md,$(pkg)*.{pdf,sty,lua,el}}
         rm $(pkg)
 
+hal: clean
+        zip -Drq $(PWD)/$(pkg)-$(VERS).zip *
+
 package: clean all
         mkdir -p arabluatex/samples/
         cp *.{lua,ins,dtx,md,pdf} makefile README.tex arabluatex/ # .bib is in dtx
@@ -71,21 +75,21 @@ package: clean all
         mkdir -p source/lualatex/arabluatex/
         cp *.{ins,dtx,tex,md}  makefile source/lualatex/arabluatex/ # .bib is in dtx
         zip -r arabluatex.tds.zip tex doc source
-        tar czf arabluatex-$(ver).tar.gz arabluatex.tds.zip arabluatex/
+        tar czf arabluatex-$(VERS).tar.gz arabluatex.tds.zip arabluatex/
 
 clean:
         rm -rf $(TEXMFDIR)/{tex,doc}/lualatex/arabluatex/
-        rm -rf $(HOMEDIR)/.emacs.d/auctex/auto/arabluatex*.{el,elc}
+        rm -rf $(HOMEDIR)/.emacs.d/auctex/style/arabluatex*.{el,elc}
         rm -rf tex/ doc/ source/ auto/
         rm -rf arabluatex/
         rm -rf saved/ TMP/ _minted-arabluatex/
         find ./samples/ | grep -v "\./samples/$$" | grep -v ".*tex$$" | xargs rm -rf
         mkdir saved
-        cp *.{lua,ins,dtx,tex,el} makefile saved # .bib is in dtx
+        cp *.{lua,ins,dtx,tex,el} AUTHORS.md LICENSE makefile saved # .bib is in dtx
         rm *.*
         cp saved/* .
         rm -rf saved/
-        pandoc -s README.tex -o README.md && sed -i 's/{#.*}//g' README.md
-        pandoc -s README.tex -o about.html
+        pandoc README.tex -o README.md && sed -i 's/{#.*}//g' README.md
+        pandoc README.tex -o about.html
 
 .PHONY: sty doc all local inst auctex zip package clean