The following commit has been merged in the master branch:
commit 0ed90da7f4ec6828d85dc78a98b3c8d32f55151b
Author: Guillem Jover <[email protected]>
Date: Mon Sep 19 17:12:56 2011 +0200
build: Merge PO4A_COMMON_OPTS and PO4A_BUILD_OPTS into PO4A_OPTS
diff --git a/man/Makefile.am b/man/Makefile.am
index d989bf8..12bf44b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -72,8 +72,7 @@ PO4A_V = $(PO4A_V_$(V))
PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
PO4A_V_0 = @echo " PO4A $@";
-PO4A_COMMON_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR)
-PO4A_BUILD_OPTS = $(PO4A_COMMON_OPTS) --no-backups
+PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups
all-local: all-local-@USE_PO4A@
@@ -82,7 +81,7 @@ all-local-yes: man.stamp
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
- $(PO4A_V) $(PO4A) $(PO4A_BUILD_OPTS) $(srcdir)/po/po4a.cfg
+ $(PO4A_V) $(PO4A) $(PO4A_OPTS) $(srcdir)/po/po4a.cfg
$(AM_V_at) touch $@
clean-local: clean-local-@USE_PO4A@
@@ -95,7 +94,7 @@ clean-local-yes:
.PHONY: update-po
update-po:
- $(PO4A_V) $(PO4A) $(PO4A_BUILD_OPTS) --force $(srcdir)/po/po4a.cfg
+ $(PO4A_V) $(PO4A) $(PO4A_OPTS) --force $(srcdir)/po/po4a.cfg
install-data-local: install-data-local-@USE_PO4A@
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
