Lines 1-5
Link Here
|
1 |
--- doc/Makefile.in.orig Wed Sep 20 10:27:06 2006 |
1 |
--- doc/Makefile.in.orig Tue May 29 11:07:06 2007 |
2 |
+++ doc/Makefile.in Fri Dec 15 12:24:05 2006 |
2 |
+++ doc/Makefile.in Wed May 30 10:58:27 2007 |
3 |
@@ -52,8 +52,12 @@ |
3 |
@@ -52,8 +52,12 @@ |
4 |
CONFIG_CLEAN_FILES = |
4 |
CONFIG_CLEAN_FILES = |
5 |
SOURCES = |
5 |
SOURCES = |
Lines 13-24
Link Here
|
13 |
am__TEXINFO_TEX_DIR = $(srcdir) |
13 |
am__TEXINFO_TEX_DIR = $(srcdir) |
14 |
DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \ |
14 |
DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \ |
15 |
cfengine-Anomalies.dvi |
15 |
cfengine-Anomalies.dvi |
16 |
@@ -205,15 +209,23 @@ |
16 |
@@ -171,7 +175,7 @@ |
|
|
17 |
build_vendor = @build_vendor@ |
18 |
datadir = @datadir@ |
19 |
datarootdir = @datarootdir@ |
20 |
-docdir = $(pkgdatadir)/doc |
21 |
+docdir = $(prefix)/share/doc/cfengine |
22 |
dvidir = @dvidir@ |
23 |
exec_prefix = @exec_prefix@ |
24 |
host = @host@ |
25 |
@@ -179,7 +183,7 @@ |
26 |
host_cpu = @host_cpu@ |
27 |
host_os = @host_os@ |
28 |
host_vendor = @host_vendor@ |
29 |
-htmldir = $(pkgdatadir)/html |
30 |
+htmldir = $(docdir) |
31 |
includedir = @includedir@ |
32 |
infodir = @infodir@ |
33 |
install_sh = @install_sh@ |
34 |
@@ -213,13 +217,21 @@ |
17 |
|
35 |
|
18 |
# Info used in building and installing HTML files |
36 |
# Info used in building and installing HTML files |
19 |
htmlfiles = $(info_TEXINFOS:.texinfo=.html) |
37 |
htmlfiles = $(info_TEXINFOS:.texinfo=.html) |
20 |
-htmldir = $(pkgdatadir)/html |
|
|
21 |
+htmldir = $(docdir) |
22 |
+.if defined(NOPORTDOCS) |
38 |
+.if defined(NOPORTDOCS) |
23 |
+html_DATA = |
39 |
+html_DATA = |
24 |
+.else |
40 |
+.else |
Lines 29-37
Link Here
|
29 |
psfiles = $(info_TEXINFOS:.texinfo=.ps) |
45 |
psfiles = $(info_TEXINFOS:.texinfo=.ps) |
30 |
pdffiles = $(info_TEXINFOS:.texinfo=.pdf) |
46 |
pdffiles = $(info_TEXINFOS:.texinfo=.pdf) |
31 |
dvifiles = $(info_TEXINFOS:.texinfo=.dvi) |
47 |
dvifiles = $(info_TEXINFOS:.texinfo=.dvi) |
32 |
-docdir = $(pkgdatadir)/doc |
48 |
+if defined(NOPORTDOCS) |
33 |
+docdir = $(prefix)/share/doc/cfengine |
|
|
34 |
+.if defined(NOPORTDOCS) |
35 |
+doc_DATA = |
49 |
+doc_DATA = |
36 |
+.else |
50 |
+.else |
37 |
doc_DATA = $(psfiles) $(pdffiles) |
51 |
doc_DATA = $(psfiles) $(pdffiles) |
Lines 39-45
Link Here
|
39 |
|
53 |
|
40 |
# Make sure these get distributed with everything else. |
54 |
# Make sure these get distributed with everything else. |
41 |
EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles) $(psfiles) $(dvifiles) $(pdffiles) |
55 |
EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles) $(psfiles) $(dvifiles) $(pdffiles) |
42 |
@@ -316,7 +328,7 @@ |
56 |
@@ -324,7 +336,7 @@ |
43 |
exit 1; \ |
57 |
exit 1; \ |
44 |
fi |
58 |
fi |
45 |
$(srcdir)/version1.texi: $(srcdir)/stamp-vti |
59 |
$(srcdir)/version1.texi: $(srcdir)/stamp-vti |
Lines 48-54
Link Here
|
48 |
@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \ |
62 |
@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \ |
49 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \ |
63 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \ |
50 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
64 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
51 |
@@ -375,7 +387,7 @@ |
65 |
@@ -385,7 +397,7 @@ |
52 |
exit 1; \ |
66 |
exit 1; \ |
53 |
fi |
67 |
fi |
54 |
$(srcdir)/version2.texi: $(srcdir)/stamp-1 |
68 |
$(srcdir)/version2.texi: $(srcdir)/stamp-1 |
Lines 57-63
Link Here
|
57 |
@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \ |
71 |
@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \ |
58 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \ |
72 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \ |
59 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
73 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
60 |
@@ -434,7 +446,7 @@ |
74 |
@@ -446,7 +458,7 @@ |
61 |
exit 1; \ |
75 |
exit 1; \ |
62 |
fi |
76 |
fi |
63 |
$(srcdir)/version3.texi: $(srcdir)/stamp-2 |
77 |
$(srcdir)/version3.texi: $(srcdir)/stamp-2 |
Lines 66-72
Link Here
|
66 |
@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \ |
80 |
@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \ |
67 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \ |
81 |
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \ |
68 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
82 |
echo "@set UPDATED $$1 $$2 $$3"; \ |
69 |
@@ -579,6 +591,7 @@ |
83 |
@@ -592,6 +604,7 @@ |
70 |
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ |
84 |
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ |
71 |
done |
85 |
done |
72 |
install-docDATA: $(doc_DATA) |
86 |
install-docDATA: $(doc_DATA) |
Lines 74-80
Link Here
|
74 |
@$(NORMAL_INSTALL) |
88 |
@$(NORMAL_INSTALL) |
75 |
test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" |
89 |
test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" |
76 |
@list='$(doc_DATA)'; for p in $$list; do \ |
90 |
@list='$(doc_DATA)'; for p in $$list; do \ |
77 |
@@ -587,6 +600,7 @@ |
91 |
@@ -600,6 +613,7 @@ |
78 |
echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ |
92 |
echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ |
79 |
$(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ |
93 |
$(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ |
80 |
done |
94 |
done |
Lines 82-88
Link Here
|
82 |
|
96 |
|
83 |
uninstall-docDATA: |
97 |
uninstall-docDATA: |
84 |
@$(NORMAL_UNINSTALL) |
98 |
@$(NORMAL_UNINSTALL) |
85 |
@@ -596,6 +610,7 @@ |
99 |
@@ -609,6 +623,7 @@ |
86 |
rm -f "$(DESTDIR)$(docdir)/$$f"; \ |
100 |
rm -f "$(DESTDIR)$(docdir)/$$f"; \ |
87 |
done |
101 |
done |
88 |
install-htmlDATA: $(html_DATA) |
102 |
install-htmlDATA: $(html_DATA) |
Lines 90-96
Link Here
|
90 |
@$(NORMAL_INSTALL) |
104 |
@$(NORMAL_INSTALL) |
91 |
test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" |
105 |
test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" |
92 |
@list='$(html_DATA)'; for p in $$list; do \ |
106 |
@list='$(html_DATA)'; for p in $$list; do \ |
93 |
@@ -604,6 +619,7 @@ |
107 |
@@ -617,6 +632,7 @@ |
94 |
echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ |
108 |
echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ |
95 |
$(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ |
109 |
$(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ |
96 |
done |
110 |
done |
Lines 98-104
Link Here
|
98 |
|
112 |
|
99 |
uninstall-htmlDATA: |
113 |
uninstall-htmlDATA: |
100 |
@$(NORMAL_UNINSTALL) |
114 |
@$(NORMAL_UNINSTALL) |
101 |
@@ -712,6 +728,7 @@ |
115 |
@@ -725,6 +741,7 @@ |
102 |
install-info: install-info-am |
116 |
install-info: install-info-am |
103 |
|
117 |
|
104 |
install-info-am: $(INFO_DEPS) |
118 |
install-info-am: $(INFO_DEPS) |
Lines 106-112
Link Here
|
106 |
@$(NORMAL_INSTALL) |
120 |
@$(NORMAL_INSTALL) |
107 |
test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" |
121 |
test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" |
108 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
122 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
109 |
@@ -741,6 +758,7 @@ |
123 |
@@ -754,6 +771,7 @@ |
110 |
install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ |
124 |
install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ |
111 |
done; \ |
125 |
done; \ |
112 |
else : ; fi |
126 |
else : ; fi |