aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-30 20:06:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-30 20:06:41 +0000
commit824aa9bd2263b57453fa896143bc100137b851a3 (patch)
treece7a73132193ac84d78b75b8379efe16161176c4
parenta5f567e056335d62f526f8caf4e2b2979921677e (diff)
downloadpaludis-824aa9bd2263b57453fa896143bc100137b851a3.tar.gz
paludis-824aa9bd2263b57453fa896143bc100137b851a3.tar.xz
Distribute man pages as part of the dist tarball, to prevent problems when crosscompiling. Tidy up --help slightly.
-rw-r--r--src/paludis/Makefile.am7
-rw-r--r--src/paludis/command_line.cc12
-rw-r--r--src/qualudis/Makefile.am34
3 files changed, 29 insertions, 24 deletions
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index 89cdf3f..b8b41ce 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -60,10 +60,13 @@ TESTS = version_TEST help_TEST list_sync_formats_TEST \
list_repository_formats_TEST list_dep_tag_categories_TEST \
exception_TEST install_TEST upgrade_TEST
-EXTRA_DIST = $(TESTS) \
+EXTRA_DIST = \
+ $(man_MANS) \
+ $(TESTS) \
install_TEST_setup.sh install_TEST_cleanup.sh \
upgrade_TEST_setup.sh upgrade_TEST_cleanup.sh
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda $(man_MANS)
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+DISTCLEANFILES = $(man_MANS)
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/paludis/command_line.cc b/src/paludis/command_line.cc
index a7f4f61..328f620 100644
--- a/src/paludis/command_line.cc
+++ b/src/paludis/command_line.cc
@@ -28,12 +28,12 @@ CommandLine::CommandLine() :
a_query(&action_args, "query", 'q', "Query for package information"),
a_install(&action_args, "install", 'i', "Install one or more packages"),
a_uninstall(&action_args, "uninstall", 'u', "Uninstall one or more packages"),
- a_sync(&action_args, "sync", 's', "Sync repositories"),
- a_contents(&action_args, "contents", 'k', "Display contents of a package"),
- a_owner(&action_args, "owner", 'o', "Display the owner of a file"),
- a_version(&action_args, "version", 'V', "Display program version"),
- a_info(&action_args, "info", 'I', "Display program version and system information"),
- a_help(&action_args, "help", 'h', "Display program help"),
+ a_sync(&action_args, "sync", 's', "Sync all or specified repositories"),
+ a_contents(&action_args, "contents", 'k', "Display contents of a package"),
+ a_owner(&action_args, "owner", 'o', "Display the owner of a file"),
+ a_version(&action_args, "version", 'V', "Display program version"),
+ a_info(&action_args, "info", 'I', "Display program version and system information"),
+ a_help(&action_args, "help", 'h', "Display program help"),
action_args_internal(this, "More actions",
"Additional actions, mostly for script and internal use."),
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 74714ed..8d52380 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -11,21 +11,6 @@ bin_PROGRAMS = qualudis
noinst_PROGRAMS = man-qualudis
man_MANS = qualudis.1
-qualudis.1 : man-qualudis
- ./man-qualudis | tee $@ | sed -e 's/^/ /'
-
-man_qualudis_SOURCES = \
- man_qualudis.cc \
- qualudis_command_line.hh \
- qualudis_command_line.cc
-
-man_qualudis_LDADD = \
- $(top_builddir)/paludis/qa/libpaludisqa.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(DYNAMIC_LD_LIBS)
-
qualudis_SOURCES = \
qualudis_command_line.hh qualudis_command_line.cc \
qualudis.cc
@@ -49,6 +34,23 @@ version_TEST :
endif
-CLEANFILES = *~ version_TEST gmon.out *.gcov *.gcno *.gcda $(man_MANS)
+qualudis.1 : man-qualudis
+ ./man-qualudis | tee $@ | sed -e 's/^/ /'
+
+man_qualudis_SOURCES = \
+ man_qualudis.cc \
+ qualudis_command_line.hh \
+ qualudis_command_line.cc
+
+man_qualudis_LDADD = \
+ $(top_builddir)/paludis/qa/libpaludisqa.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/args/libpaludisargs.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(DYNAMIC_LD_LIBS)
+
+CLEANFILES = *~ version_TEST gmon.out *.gcov *.gcno *.gcda
+DISTCLEANFILES = $(man_MANS)
MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(man_MANS)