[anaconda][rhel7-branch/master][PATCH] Fix autotools rules to properly include help placeholders (#1072033)
Martin Kolman
mkolman at redhat.com
Thu Oct 2 15:39:45 UTC 2014
Related: rhbz#1072033
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
anaconda.spec.in | 1 +
configure.ac | 2 ++
data/Makefile.am | 2 +-
data/help/Makefile.am | 2 +-
data/help/en-US/Makefile.am | 2 +-
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index a1fa861..3918155 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -271,6 +271,7 @@ update-desktop-database &> /dev/null || :
%{_sysconfdir}/X11/xinit/xinitrc.d/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*
+%{_datadir}/doc/anaconda/*
%endif
%files gui
diff --git a/configure.ac b/configure.ac
index 238ab32..7b613e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,6 +229,8 @@ AC_CONFIG_FILES([Makefile
data/icons/hicolor/256x256/Makefile
data/icons/hicolor/256x256/apps/Makefile
data/systemd/Makefile
+ data/help/Makefile
+ data/help/en-US/Makefile
po/Makefile.in
scripts/Makefile
pyanaconda/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index ebbdaaf..cf5894b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: Martin Sivak <msivak at redhat.com>
-SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts
+SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts help
CLEANFILES = *~
diff --git a/data/help/Makefile.am b/data/help/Makefile.am
index 8be7029..ed2eda3 100644
--- a/data/help/Makefile.am
+++ b/data/help/Makefile.am
@@ -16,6 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Author: Martin Kolman <mkolman at redhat.com>
+SUBDIRS = en-US
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = en-US
diff --git a/data/help/en-US/Makefile.am b/data/help/en-US/Makefile.am
index 0cd10bc..0b46f4a 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>
-enplacholderdir = $(docdir)/en-US
+enplaceholderdir = $(docdir)/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