1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
See https://gitlab.com/agmartin/linuxdoc-tools/issues/4
diff --git a/Makefile.in b/Makefile.in
index adb85d0..7038d97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,13 +83,14 @@ ifneq ($(BUILDDOC_FORMATS),)
# -- Build documentation
@echo "Building documentation ..."
(cd doc; \
+ MAKE="$(MAKE)" \
PREFIX=$(prefix) \
BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
- PKGPERL5LIB=$(CURDIR)/perl5lib \
- PKGDATADIR=$(CURDIR)/lib \
+ PKGPERL5LIB=$(CURDIR)/perl5lib \
+ PKGDATADIR=$(CURDIR)/lib \
PKGENTITYMAPDIR=$(CURDIR)/entity-map \
- BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
+ BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
sh Makedoc.sh)
endif
diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index b7e2efb..da4be99 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -33,7 +33,7 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
# Create a modified EntityMap.pm with entity-map location in doc
# build temporary dir. Need to properly install entity-map there.
mkdir $TMPDIR/Text
- make -C ../entity-map install DESTDIR="$TMPDIR"
+ ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
-e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
-e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
@@ -49,7 +49,7 @@ fi
if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
# --without-installed-iso-entities: Install iso-entities in
# "$TMPDIR/usr" and set it as iso-entities prefix.
- make -C ../iso-entities install DESTDIR="$TMPDIR"
+ ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
ISOENTITIES_PREFIX="${TMPDIR}/usr"
else
# --with-installed-iso-entities: Use system prefix.
@@ -88,45 +88,42 @@ fi
# Build actual documentation
echo "- Building documentation for formats: ${BUILDDOC_FORMATS}" >&2
+BUILDDOC_MAKE=""
for docformat in ${BUILDDOC_FORMATS}; do
case ${docformat} in
txt)
- echo "- Building txt docs" >&2
if [ -n "`which groff`" ]; then
- $TMPDIR/linuxdoc --backend=txt --filter --blanks=1 ./guide.sgml
+ echo "- Add to build list: guide.txt" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.txt"
else
echo "- ++ Warning: groff not available, cannot build \"${docformat}\" format." >&2
fi
;;
pdf)
- echo "- Building pdf docs" >&2
- $TMPDIR/linuxdoc --backend=latex --output=pdf \
- --pass="\usepackage{times}" ./guide.sgml
+ echo "- Add to build list: guide.pdf" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.pdf"
;;
info)
- echo "- Building info docs" >&2
- $TMPDIR/linuxdoc --backend=info ./guide.sgml
+ echo "- Add to build list: guide.info" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.info"
;;
lyx)
- echo "- Building lyx docs" >&2
- $TMPDIR/linuxdoc --backend=lyx ./guide.sgml
+ echo "- Add to build list: guide.lyx" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.lyx"
;;
html)
- echo "- Building html docs" >&2
- $TMPDIR/linuxdoc --imagebuttons --backend=html ./guide.sgml \
- && mv -f ./guide*.html ./html
+ echo "- Add to build list: guide.html" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} html/guide.html"
;;
rtf)
- echo "- Building rtf docs" >&2
- $TMPDIR/linuxdoc --backend=rtf ./guide.sgml && if [ ! -d ./rtf ]; \
- then mkdir -m 755 ./rtf; fi && mv -f ./guide*.rtf ./rtf
+ echo "- Add to build list: guide.rtf" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} rtf/guide.rtf"
;;
dvi+ps)
echo "- Building latex docs" >&2
if [ -n "`which latex`" ]; then
- echo "- Building dvi docs" >&2
- $TMPDIR/linuxdoc --backend=latex --output=dvi \
- --pass="\usepackage{times}" ./guide.sgml
+ echo "- Add to build list: guide.dvi" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.dvi"
if [ -n "`which dvips`" ]; then
echo " + dvips" >&2
@@ -137,9 +134,13 @@ for docformat in ${BUILDDOC_FORMATS}; do
DVIPS_PAPER="letter"
fi
fi
- dvips -t ${DVIPS_PAPER} -o ./guide.ps ./guide.dvi
- if [ -n "`which gzip`" -a -f ./guide.ps ]; then
- gzip -fn ./guide.ps
+
+ if [ -n "`which gzip`" ]; then
+ echo "- Add to build list: guide.ps.gz" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps.gz"
+ else
+ echo "- Add to build list: guide.ps" >&2
+ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps"
fi
else
echo "- ++ Warning: dvips not available, cannot build \"guide.ps\"." >&2
@@ -156,7 +157,9 @@ for docformat in ${BUILDDOC_FORMATS}; do
esac
done
+${MAKE} TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
+
# Remove temporary directory.
-rm -rf $TMPDIR
+rm -rf "${TMPDIR}"
exit 0
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..79c5382
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,44 @@
+
+
+%.txt: %.sgml
+ @echo "- Building txt docs" >&2
+ $(TMPDIR)/linuxdoc --backend=txt --filter --blanks=1 $<
+
+%.pdf: %.sgml
+ @echo "- Building pdf docs" >&2
+ $(TMPDIR)/linuxdoc --backend=latex \
+ --output=pdf \
+ --pass="\usepackage{times}" $<
+
+%.info: %.sgml
+ @echo "- Building info docs" >&2
+ $(TMPDIR)/linuxdoc --backend=info $<
+
+%.lyx: %.sgml
+ @echo "- Building lyx docs" >&2
+ $(TMPDIR)/linuxdoc --backend=lyx $<
+
+html/%.html: %.sgml
+ @echo "- Building html docs" >&2
+ $(TMPDIR)/linuxdoc --imagebuttons --backend=html $<
+ mv -f ./guide*.html ./html
+
+rtf/%.rtf: %.sgml
+ @echo "- Building rtf docs" >&2
+ $(TMPDIR)/linuxdoc --backend=rtf $<
+ mkdir -m 755 -p ./rtf
+ mv -f ./guide*.rtf ./rtf
+
+%.dvi: %.sgml
+ @echo "- Building dvi docs" >&2
+ $(TMPDIR)/linuxdoc --backend=latex \
+ --output=dvi \
+ --pass="\usepackage{times}" $<
+
+%.ps: %.dvi
+ @echo "- Building ps docs" >&2
+ dvips -t $(DVIPS_PAPER) -o $@ $<
+
+%.ps.gz: %.ps
+ @echo "- Building ps.gz docs" >&2
+ gzip -fn $<
|
GitWeb