6:43 p.m.
In centos, if I make rpm and not make install will failed
it's because dita-help.xsl and kimchi.css not in
dir rpm/BUILD/kimchi-1.2.0/ui/pages/help
Fix it by adding the two file in the Makefile.am
and add them in kimchi.spec.suse.in kimchi.spec.fedora.in
Signed-off-by: Ding Xiao <ssdxiao(a)163.com>
---
contrib/kimchi.spec.fedora.in | 2 ++
contrib/kimchi.spec.suse.in | 2 ++
ui/pages/help/Makefile.am | 4 ++++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index 2d4699b..570f1a5 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -179,6 +179,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/libs/themes/base/jquery-ui.min.css
%{_datadir}/kimchi/ui/pages/*.html.tmpl
%{_datadir}/kimchi/ui/pages/help/*/*.html
+%{_datadir}/kimchi/ui/pages/help/kimchi.css
+%{_datadir}/kimchi/ui/pages/help/dita-help.xsl
%{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
%{_datadir}/kimchi/ui/pages/websockify/*.html
%{_sysconfdir}/kimchi/kimchi.conf
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 165f566..4d1a46f 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -101,6 +101,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/libs/themes/base/jquery-ui.min.css
%{_datadir}/kimchi/ui/pages/*.html.tmpl
%{_datadir}/kimchi/ui/pages/help/*/*.html
+%{_datadir}/kimchi/ui/pages/help/kimchi.css
+%{_datadir}/kimchi/ui/pages/help/dita-help.xsl
%{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
%{_datadir}/kimchi/ui/pages/websockify/*.html
%{_sysconfdir}/kimchi/kimchi.conf
diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am
index 1af984a..377c1a3 100644
--- a/ui/pages/help/Makefile.am
+++ b/ui/pages/help/Makefile.am
@@ -21,6 +21,10 @@ HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard
*/*.html))
DITA_XSL_FILE = dita-help.xsl
EXTRA_DIST = gen-index.py
+helpdir = $(datadir)/kimchi/ui/pages/help
+
+dist_help_DATA = dita-help.xsl \
+ kimchi.css
all: $(HTML_FILES) $(wildcard */*.dita)
@$(foreach dir, $(dir $(wildcard */)), $(shell pwd)/gen-index.py $(wildcard
$(dir)*.dita) > $(dir)/index.html;)
--
1.7.1