The following commit has been merged in the master branch:
commit 780d969788cbc639b75e876d010fbc0e80956aa0
Author: Guillem Jover <[email protected]>
Date: Tue May 5 17:40:32 2009 +0200
Do not install dselect and s-s-d man pages if disabled on configure
When configuring with --without-dselect or --without-start-stop-daemon,
do not install the man pages related to those programs.
diff --git a/debian/changelog b/debian/changelog
index 86d9158..4038122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
* Add '.hgtags' to the default dpkg-source -i regex and -I pattern.
Closes: #525854
* Use backticks instead of non-portable make $(shell) function in automake.
+ * Do not install dselect and start-stop-daemon man pages when the programs
+ have been disabled from configure.
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/man/Makefile.am b/man/Makefile.am
index 0d526bf..cba3101 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,13 +32,16 @@ install-data-local: install-data-loc...@use_nls@
install-data-local-no:
install-data-local-yes:
for lang in $(LINGUAS); do \
- if [ -d $(srcdir)/$$lang ]; then \
- files=$$(echo $(srcdir)/$$lang/*.[1-9]); \
- $(MAKE) install-man \
- mandir="$(mandir)/$$lang" \
- man_MANS="" \
- dist_man_MANS="$$files"; \
- fi \
+ files=""; \
+ for trans in $(dist_man_MANS); do \
+ if [ -f $(srcdir)/$$lang/$$trans ]; then \
+ files="$$files $(srcdir)/$$lang/$$trans"; \
+ fi; \
+ done; \
+ $(MAKE) install-man \
+ mandir="$(mandir)/$$lang" \
+ man_MANS="" \
+ dist_man_MANS="$$files"; \
done
uninstall-local: uninstall-loc...@use_nls@
@@ -46,13 +49,16 @@ uninstall-local: uninstall-loc...@use_nls@
uninstall-local-no:
uninstall-local-yes:
for lang in $(LINGUAS); do \
- if [ -d $(srcdir)/$$lang ]; then \
- files=$$(echo $(srcdir)/$$lang/*.[1-9]); \
- $(MAKE) uninstall-man \
- mandir="$(mandir)/$$lang" \
- man_MANS="" \
- dist_man_MANS="$$files"; \
- fi \
+ files=""; \
+ for trans in $(dist_man_MANS); do \
+ if [ -f $(srcdir)/$$lang/$$trans ]; then \
+ files="$$files $(srcdir)/$$lang/$$trans"; \
+ fi; \
+ done; \
+ $(MAKE) uninstall-man \
+ mandir="$(mandir)/$$lang" \
+ man_MANS="" \
+ dist_man_MANS="$$files"; \
done
dist-hook: man.stamp
@@ -96,12 +102,20 @@ dist_man_MANS = \
dpkg-trigger.1 \
dpkg.1 \
dpkg.cfg.5 \
- dselect.1 \
- dselect.cfg.5 \
install-info.8 \
- start-stop-daemon.8 \
update-alternatives.8
+if WITH_DSELECT
+dist_man_MANS += \
+ dselect.1 \
+ dselect.cfg.5
+endif
+
+if WITH_START_STOP_DAEMON
+dist_man_MANS += \
+ start-stop-daemon.8
+endif
+
EXTRA_DIST = \
po/ChangeLog.old \
po/po4a.cfg \
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
