1 files changed, 48 insertions, 22 deletions

diff --git a/makefile b/makefile
index 5fde0a0..d88512f 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,24 @@
 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
+SHELL = bash
 
 sty: clean
-        lualatex $(pkg).ins
+        $(CMP) $(pkg).ins
 
 doc: clean sty
-        lualatex --shell-escape $(pkg).dtx
+        $(CMP) --shell-escape $(pkg).dtx
         biber arabluatex
-        lualatex --shell-escape $(pkg).dtx
+        $(CMP) --shell-escape $(pkg).dtx
         makeindex -s gind.ist -o $(pkg).ind $(pkg).idx
         makeindex -s gglo.ist -o $(pkg).gls $(pkg).glo
-        lualatex --shell-escape $(pkg).dtx
-        lualatex --shell-escape $(pkg).dtx
+        $(CMP) --shell-escape $(pkg).dtx
+        $(CMP) --shell-escape $(pkg).dtx
         for i in samples/*.tex; \
-        do latexmk -outdir=TMP -lualatex -e '$$lualatex=q/lualatex %O --shell-escape %S/' $$i; \
+        do latexmk -outdir=TMP -lualatex -e '$$lualatex=q/$(CMP) %O --shell-escape %S/' $$i; \
         done
         mv TMP/*.pdf samples/
 
@@ -26,20 +29,43 @@ 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/style" ]; then \
+        mkdir -p $(HOMEDIR)/.emacs.d/auctex/style; \
+        fi
+        cp $(pkg)*.el $(HOMEDIR)/.emacs.d/auctex/style
+        if [ ! -d "$(TEXMFDIR)/doc/lualatex/arabluatex" ]; then \
+        mkdir -p $(TEXMFDIR)/doc/lualatex/arabluatex; \
+        fi
+        cp $(pkg).pdf $(TEXMFDIR)/doc/lualatex/arabluatex
+        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)-$(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 arabluatex/ # .bib is in dtx
+        cp *.{lua,ins,dtx,md,pdf} makefile README.tex arabluatex/ # .bib is in dtx
         cp samples/*.{tex,pdf} arabluatex/samples/
         mkdir -p tex/lualatex/arabluatex/
         cp *.lua *.sty tex/lualatex/arabluatex/
@@ -47,23 +73,23 @@ package: clean all
         cp *.{pdf,el} doc/lualatex/arabluatex/
         cp samples/*.{tex,pdf} doc/lualatex/arabluatex/samples
         mkdir -p source/lualatex/arabluatex/
-        cp *.ins *.dtx *.tex source/lualatex/arabluatex/ # .bib is in dtx
+        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/lualatex/arabluatex/
-        rm -rf $(HOMEDIR)/.emacs.d/auctex/auto/arabluatex*.el
+        rm -rf $(TEXMFDIR)/{tex,doc}/lualatex/arabluatex/
+        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 auctex package clean
+.PHONY: sty doc all local inst auctex zip package clean