The following commit has been merged in the master branch:
commit 3081af870546d7920d56a44611b7bc185286bda8
Author: Guillem Jover <[email protected]>
Date: Mon Sep 19 16:34:14 2011 +0200
build: Place all man rules at the end of the Makefile.am
diff --git a/man/Makefile.am b/man/Makefile.am
index 5eedfb9..9e1c4e4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,73 @@
## Process this file with automake to produce Makefile.in
+dist_man_MANS = \
+ deb-control.5 \
+ deb-src-control.5 \
+ deb-version.5 \
+ deb-shlibs.5 \
+ deb-split.5 \
+ deb-substvars.5 \
+ deb-symbols.5 \
+ deb-triggers.5 \
+ deb-old.5 \
+ deb-override.5 \
+ deb-extra-override.5 \
+ deb.5 \
+ dpkg-architecture.1 \
+ dpkg-buildflags.1 \
+ dpkg-buildpackage.1 \
+ dpkg-checkbuilddeps.1 \
+ dpkg-deb.1 \
+ dpkg-distaddfile.1 \
+ dpkg-divert.8 \
+ dpkg-genchanges.1 \
+ dpkg-gencontrol.1 \
+ dpkg-gensymbols.1 \
+ dpkg-maintscript-helper.1 \
+ dpkg-mergechangelogs.1 \
+ dpkg-name.1 \
+ dpkg-parsechangelog.1 \
+ dpkg-query.1 \
+ dpkg-scanpackages.1 \
+ dpkg-scansources.1 \
+ dpkg-shlibdeps.1 \
+ dpkg-source.1 \
+ dpkg-split.1 \
+ dpkg-statoverride.8 \
+ dpkg-trigger.1 \
+ dpkg-vendor.1 \
+ dpkg.1 \
+ dpkg.cfg.5
+
+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
+
+if WITH_UPDATE_ALTERNATIVES
+dist_man_MANS += \
+ update-alternatives.8
+endif
+
+EXTRA_DIST = \
+ po/ChangeLog.old \
+ po/po4a.cfg \
+ po/dpkg-man.pot
+
+
+# Extract the list of languages from the po4a config file.
+LINGUAS_DIST = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg`
+
+# If the user has not defined it let's use the default.
+LINGUAS ?= $(LINGUAS_DIST)
+
+
PO4A_V = $(PO4A_V_$(V))
PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
PO4A_V_0 = @echo " PO4A $@";
@@ -8,15 +76,15 @@ PO4A_RM_V = $(PO4A_RM_V_$(V))
PO4A_RM_V_ = $(PO4A_RM_V_$(AM_DEFAULT_VERBOSITY))
PO4A_RM_V_0 = @echo " PO4ARM $@";
+PO4A_COMMON_OPTS = --previous --variable builddir=$(CURDIR)
+PO4A_BUILD_OPTS = $(PO4A_COMMON_OPTS) --no-backups
+PO4A_CLEAN_OPTS = $(PO4A_COMMON_OPTS) --rm-backups --rm-translations
+
all-local: all-local-@USE_PO4A@
all-local-no:
all-local-yes: man.stamp
-PO4A_COMMON_OPTS = --previous --variable builddir=$(CURDIR)
-PO4A_BUILD_OPTS = $(PO4A_COMMON_OPTS) --no-backups
-PO4A_CLEAN_OPTS = $(PO4A_COMMON_OPTS) --rm-backups --rm-translations
-
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
$(PO4A_V) cd $(srcdir) && \
@@ -31,16 +99,12 @@ clean-local-yes:
$(PO4A) $(PO4A_CLEAN_OPTS) po/po4a.cfg
$(AM_V_at) rm -f man.stamp
+.PHONY: update-po
+
update-po:
$(PO4A_V) cd $(srcdir) && \
$(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg
-# Extract the list of languages from the po4a config file.
-LINGUAS_DIST = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg`
-
-# If the user has not defined it let's use the default.
-LINGUAS ?= $(LINGUAS_DIST)
-
install-data-local: install-data-local-@USE_PO4A@
install-data-local-no:
@@ -87,65 +151,3 @@ dist-hook: man.stamp
$(mkdir_p) $(distdir)/$$lang; \
cp -r $(srcdir)/$$lang $(distdir)/; \
done
-
-dist_man_MANS = \
- deb-control.5 \
- deb-src-control.5 \
- deb-version.5 \
- deb-shlibs.5 \
- deb-split.5 \
- deb-substvars.5 \
- deb-symbols.5 \
- deb-triggers.5 \
- deb-old.5 \
- deb-override.5 \
- deb-extra-override.5 \
- deb.5 \
- dpkg-architecture.1 \
- dpkg-buildflags.1 \
- dpkg-buildpackage.1 \
- dpkg-checkbuilddeps.1 \
- dpkg-deb.1 \
- dpkg-distaddfile.1 \
- dpkg-divert.8 \
- dpkg-genchanges.1 \
- dpkg-gencontrol.1 \
- dpkg-gensymbols.1 \
- dpkg-maintscript-helper.1 \
- dpkg-mergechangelogs.1 \
- dpkg-name.1 \
- dpkg-parsechangelog.1 \
- dpkg-query.1 \
- dpkg-scanpackages.1 \
- dpkg-scansources.1 \
- dpkg-shlibdeps.1 \
- dpkg-source.1 \
- dpkg-split.1 \
- dpkg-statoverride.8 \
- dpkg-trigger.1 \
- dpkg-vendor.1 \
- dpkg.1 \
- dpkg.cfg.5
-
-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
-
-if WITH_UPDATE_ALTERNATIVES
-dist_man_MANS += \
- update-alternatives.8
-endif
-
-EXTRA_DIST = \
- po/ChangeLog.old \
- po/po4a.cfg \
- po/dpkg-man.pot
-
-.PHONY: update-po
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
