From 4738c898e586496f82cbda223ac8a1472b86a556 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 13 May 2010 11:43:29 -0400 Subject: [PATCH] Don't install the help docs, they are too outdated. --- Makefile.am | 2 +- configure.ac | 19 +++++++++++-------- virt-manager.spec.in | 11 +++++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 00ddd743..f42ae5f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4/ -SUBDIRS = src pixmaps man po help tests +SUBDIRS = src pixmaps man po tests EXTRA_DIST = @PACKAGE@.spec HACKING COPYING-DOCS xmldocs.make omf.make \ intltool-extract.in intltool-merge.in intltool-update.in diff --git a/configure.ac b/configure.ac index 5e08b298..0bfdb619 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,19 @@ AC_SUBST([VIRTINST_VERSION]) dnl ==================================== dnl = Begin tests for scrollkeeper dnl ==================================== -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net) -fi +# Help is so outdated, don't even distribute it +#help/Makefile +#help/virt-manager/Makefile +#help/virt-manager/C/Makefile +#AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +#if test x$SCROLLKEEPER_CONFIG = xno; then +# AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net) +#fi dnl ==================================== dnl = End tests for scrollkeeper dnl ==================================== + AC_OUTPUT(Makefile pixmaps/Makefile pixmaps/hicolor/Makefile @@ -40,7 +45,5 @@ AC_OUTPUT(Makefile src/virtManager/Makefile man/Makefile tests/Makefile - virt-manager.spec - help/Makefile - help/virt-manager/Makefile - help/virt-manager/C/Makefile) + virt-manager.spec) + diff --git a/virt-manager.spec.in b/virt-manager.spec.in index b92246de..d383dad8 100644 --- a/virt-manager.spec.in +++ b/virt-manager.spec.in @@ -103,12 +103,14 @@ gconftool-2 --makefile-install-rule \ update-desktop-database %{_datadir}/applications -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q -o %{_datadir}/omf/%{name}; fi +# Revive when we update help docs +#if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q -o %{_datadir}/omf/%{name}; fi %postun update-desktop-database %{_datadir}/applications -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q; fi +# Revive when we update help docs +#if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q; fi %preun if [ "$1" -eq 0 ]; then @@ -144,8 +146,9 @@ fi %{_datadir}/%{name}/virtManager/*.py* -%{_datadir}/omf/%{name}/ -%{_datadir}/gnome/help/%{name} +# Revive when we update help docs +#%{_datadir}/omf/%{name}/ +#%{_datadir}/gnome/help/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/dbus-1/services/%{name}.service