[anaconda][rhel7-branch/master][PATCH] Use the /usr/share/anaconda/help for help content (#1072033)
Martin Kolman
mkolman at redhat.com
Tue Oct 7 14:54:03 UTC 2014
Turns out we can't use /usr/share/doc/anaconda/help because during
image generation the RPM transaction is running with nodocs and
all docs are removed.
Related: rhbz#1072033
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
anaconda.spec.in | 2 +-
data/help/en-US/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 2f1f77d..5511ca4 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -254,7 +254,7 @@ update-desktop-database &> /dev/null || :
%{_sbindir}/anaconda
%{_sbindir}/handle-sshpw
%{_datadir}/anaconda
-%{_datadir}/doc/anaconda/*
+%{_datadir}/anaconda/help/*
%exclude %{_datadir}/anaconda/tzmapdata
%{_prefix}/libexec/anaconda
%{_libdir}/python*/site-packages/pyanaconda/*
diff --git a/data/help/en-US/Makefile.am b/data/help/en-US/Makefile.am
index 0b46f4a..b7aa1bc 100644
--- a/data/help/en-US/Makefile.am
+++ b/data/help/en-US/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: Martin Kolman <mkolman at redhat.com>
-enplaceholderdir = $(docdir)/en-US
+enplaceholderdir = $(datadir)/anaconda/help/en-US
dist_enplaceholder_DATA = FedoraPlaceholder.html FedoraPlaceholderWithLinks.html RHEL7Placeholder.html RHEL7PlaceholderWithLinks.html
MAINTAINERCLEANFILES = Makefile.in
--
1.9.3
More information about the anaconda-patches
mailing list