From 15746aae2cc9e277433fcfde10d35b492793d0af Mon Sep 17 00:00:00 2001
From: Joan Josep Ordinas Rosa <jordinas@gmail.com>
Date: Fri, 26 Aug 2016 18:00:46 +0200
Subject: [PATCH] Generate man pages when install

---
 .gitignore |   2 ++
 Makefile   |   3 ++-
 bin/jqt    |  10 +++++-----
 jqt.1.gz   | Bin 1327 -> 0 bytes
 4 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 jqt.1.gz

diff --git a/.gitignore b/.gitignore
index fc8bb37..74a26fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 tests/generated/*.jqe
 tests/generated/*.jqs
 tests/generated/*.txt
+# man pages
+jqt.1.gz
diff --git a/Makefile b/Makefile
index 87b4564..188e934 100644
--- a/Makefile
+++ b/Makefile
@@ -97,11 +97,12 @@ all: check
 .PHONY: clean clobber install uninstall
 
 clean:
-	rm -f tests/generated/*
+	rm -f tests/generated/* jqt.1.gz
 
 clobber: clean
 
 install:
+	[[ -e jqt.1.gz ]] || { cd docs && make ../jqt.1.gz; }
 	test -d $(bindir) || $(SUDO) mkdir --verbose --parents $(bindir)
 	test -d $(datadir)/$(project) || $(SUDO) mkdir --verbose --parents $(datadir)/$(project)
 	test -d $(mandir)/man1 || $(SUDO) mkdir --verbose --parents $(mandir)/man1
diff --git a/bin/jqt b/bin/jqt
index 593cd7d..dd94a74 100755
--- a/bin/jqt
+++ b/bin/jqt
@@ -148,11 +148,11 @@ function expand_json
         +sSSS '"' '"' '\'       # JSON string
     )
     local -r -a predefined=(
-        -D amp='&'
-        -D apos="'"
-        -D gt='>'
-        -D lt='<'
-        -D quot='"'
+        -Damp='&'
+        -Dapos="'"
+        -Dgt='>'
+        -Dlt='<'
+        -Dquot='"'
     )
     gpp --nostdinc          \
         --warninglevel 2    \
diff --git a/jqt.1.gz b/jqt.1.gz
deleted file mode 100644
index aba0205a871e7e46ca0e4725233667e796a80311..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1327
zcmV+~1<?8*iwFR}?7vq41Fcuvaw0bneb-lX`H4-f!Mn-k!L@M(12JqFLjb$VWq1%X
zJ%gMXX)I}cN#%#~8~L)dq!|qH*tu*TfRRRhJAJy<v=>7-`114O01iITr(34*@#w?%
z^mv8Z2qodD{jq&S>)Sh6bAvHF;2JFEMaC@x%2Y@^VD0%3F1q6ZYfq<ancSSNZtpDp
zu3&kCas_Wmd*S)@#bi1k&0i|GQH3Q(%nCk(kcr3;PC%n6GfRj2a75qk;WeqRkoh|a
zcH>ve!;M@0RxN0WS+Towwg37)K<hSFKKTA%-kXi4i_zrbW&BD<8#GoEU<M45Fwek{
zi400BGGPVnTLpANnndXw#$5l>R}Yd|e6+x24A<T9IVplK^T`Fo+;WPLL^vculD6T3
zUdJjbbCkBt78`ul#vLRe48&U8qlEPniPaf=4-XsE7!=T%Ts*oQ3%jXf@F5r}iUO^7
zQ;;M&J78a$$y6$$w#Q`R;UGRN2=`N19)9<pzCN)zT2Q4eN*k<JU_#5SzJre6{q&BM
z%t&}PcvjG3bE^sig;o(7BV-C|B-`jc(I{ioU@T7&TET*Wq$HT1QOi|~S(EO*Xa5gZ
z-E-DQ0yXF?4Qb4Iq!kbjqm?`30pSMlt|a7b^@ar9iw4ax{4_cruo?0gA|<Uuu1*ys
zTIE53JM@YMWP?Y-IkJHUBtwz}xFzSvzOgYy+aQ;Oir$Gw@*IH>3yQX0<Y;+Cs^CnW
z_DGAu8rF(2;Z#Vb3b(iNKDaYYSPrW^)imBs7*CwnDN3pW>oz<Gw&|+N!|k#}^VIog
znv855n?j|szA(h*CkoL~m@E+m8bn6WAI%26#bkEPy2NLyD<AE4*9Yw?apPKB3@Y)D
zg~loZLM{`A_?xg;XpF4VRq?KoeCMvxV-K*9QC7wTHnkzs;ERCqq<=}g7*z+IA!@ST
zq43IkLmBxixf`_IR@#nz!bf?bwEa4b=l>BaGFTx5FA!o)2*tj?3GXs3s6fkR#KxY@
z$G(`lF^TQhjf-oqONORYyC|e<I9sA~4-X@nLPnI!ptWD$#3PYPYArFWom@#FtvwTr
zD;Vc;DaBohP1MZ)S5FOacF(gC9j0o1OPKCAqXrM;>y=L}h)T>sy)FOds)udWv%2cn
zDt>yc=%;Yry*Rt<o(-s56+Wjv5FdoQP`n$ymo5*V%c+%dnU=0)R~R#Isk%Gg2fKN^
zv$!?k=B<{IG1V>0w(G-O$k+TV*i_Tqxn=2;TvZY9D8j;_QjHJ|lA3yWuI_Qa0s9VK
zce)0tdDRTJGt<Ahy+TE?kddZnEL+fMQSmbJ6xs8RQu~H)SD}YiH}JNN);BT@QT4^X
zBTQGjWAgT5@03P&G8OTxV>Vo4hjQ1+#F~EEIkh*MZ+Iqt4fBDY${Y=SuF|4tB=B1*
z>GQVIz~X<V^BeMT?5}rx<ZiAB{rW8rDg4vRvoPk)5#dbOVY#M;VM;W|@OfixVU9bU
zlqg@W+mXsU2~~2eyuonn#H;CEE{2oY%X#sEO8!9$%AX(Bz9=r~%U}T$9n-jHV5SUb
zpKn!I{+Q-mWX{q_n7n$E>Gf=MHe7h!Jykquk!~#f@w@wP@aZ*;?R__>1!f{b>4yH&
zlhd(rJX+M-(28i9dgq&=Yo@*4^6>O}dH8Mn==n(9Wc(fO{w53t&^@0|p2H@HTOZzS
lE800wtzSa3QPjl>Dv=$a1G?=UydBUd>`zDDPh}bn008W4myG}b