MakeFile: use lualatex-dev by default, include samples/ in doctree

1 files changed, 12 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 63e0b26..01c10eb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,13 @@ findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)")
 # $(if $(wildcard $(PWD)/TMP/$(notdir $1).bcf),biber $(PWD)/TMP/$(notdir $1),)
 
 define dosamples
-        lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
-        lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
+        $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
+        $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
         if [ -f $(PWD)/TMP/$(notdir $1)-primary.idx ]; \
         then texindy -M $(PWD)/TMP/$(notdir $1).xdy $(PWD)/TMP/$(notdir $1)-primary.idx >/dev/null; fi
         if [ -f $(PWD)/TMP/$(notdir $1).bcf ]; then biber $(PWD)/TMP/$(notdir $1) >/dev/null; fi
-        lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
-        lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
+        $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
+        $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
 endef
 
 sty: clean
@@ -32,15 +32,15 @@ all:	clean sty $(NAME).pdf
 
 $(NAME).pdf: clean sty $(NAME).dtx
         @ echo "Make documentation..."
-        lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
+        $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
         biber $(NAME) >/dev/null
-        lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
+        $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
         if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
         if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
         if [ -f loccit.idx ]; then texindy -M icite.xdy loccit.idx >/dev/null; fi
         if [ -f primary.idx ]; then texindy -M icite.xdy primary.idx >/dev/null; fi
-        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
-        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
         @ echo "Make sample files..."
         if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi
         cp $(PWD)/samples/*.bib $(PWD)/TMP
@@ -54,7 +54,7 @@ samples: clean sty
         mv TMP/*.pdf samples/
 
 lualatex:
-        lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
+        $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
 
 clean:
         rm -f $(NAME).bib $(PWD)/TMP/*.bib
@@ -75,9 +75,10 @@ inst: uninst all
         cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
         cp $(NAME).pdf $(UTREE)/doc/latex/$(NAME)
+        cp -r samples/ $(UTREE)/doc/latex/$(NAME)
 
 local: uninst
-        lualatex $(NAME).ins
+        $(CMP) $(NAME).ins
         mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
 
@@ -89,6 +90,7 @@ install: all
         sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
         sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME)
         sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+        cp -r samples/ $(LOCAL)/doc/latex/$(NAME)
 
 uninstall:
         rm -rf $(LOCAL)/{tex,source,doc}/latex/$(NAME)