From 5774796d0022159824d204482a2aebf6cdf096d4 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Mon, 19 Nov 2012 23:30:22 +0100 Subject: [PATCH] Makefile.env, Makefile's: add some variables to Makefiles.env and use them in the make targets 'pot-files' Signed-off-by: Davide Madrisan --- ChangeLog | 4 ++++ Makefile | 6 ++---- Makefile.env | 2 ++ lib/Makefile | 4 ++-- plugins/Makefile | 4 ++-- tests/Makefile | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b88eb5..92a9506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,10 @@ Changes in version 1.16.0 * Makefiles - Davide Madrisan: New target 'pot-files'. + * Makefiles.env, Makefile's - Davide Madrisan: + Add some variables to Makefiles.env and use them in the make targets + 'pot-files'. + ------------------------------------------------------------------------------- Changes in version 1.14.3 diff --git a/Makefile b/Makefile index 93cf85e..50d9488 100644 --- a/Makefile +++ b/Makefile @@ -75,8 +75,8 @@ pot-files: dist-update @echo "Creating pot files..." @echo "Generating po template '$(PACKAGE).pot'..."; \ /usr/bin/xgettext -i -L shell \ - --copyright-holder="Davide Madrisan" \ - --msgid-bugs-address="davide.madrisan@gmail.com" \ + --copyright-holder="$(PO_COPYRIGH_HOLDER)" \ + --msgid-bugs-address="$(PO_BUGS_ADDRESS)" \ --no-location \ --package-name=$(PACKAGE) \ --package-version=${VERSION} \ @@ -85,8 +85,6 @@ pot-files: dist-update @$(MAKE) pot-files -C plugins || exit 1 @$(MAKE) pot-files -C tests || exit 1 -# /usr/bin/msgmerge -i --update po/it/$(PACKAGE).po po/$(PACKAGE).pot - locales: @for loc in $(LOCALES); do\ $(MAKE) -C po/$$loc || exit 1;\ diff --git a/Makefile.env b/Makefile.env index 5e39371..eb41b7a 100644 --- a/Makefile.env +++ b/Makefile.env @@ -36,3 +36,5 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DIR = ${INSTALL} -d -m 755 +PO_COPYRIGH_HOLDER = Davide Madrisan +PO_BUGS_ADDRESS = davide.madrisan@gmail.com \ No newline at end of file diff --git a/lib/Makefile b/lib/Makefile index 03b825a..2ec13fb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -36,8 +36,8 @@ pot-files: $(pck_libs) @for f in $(pck_libs); do\ echo -n "Generating po template '$$f.pot'...";\ /usr/bin/xgettext -i -L shell \ - --copyright-holder="Davide Madrisan" \ - --msgid-bugs-address="davide.madrisan@gmail.com" \ + --copyright-holder="$(PO_COPYRIGH_HOLDER)" \ + --msgid-bugs-address="$(PO_BUGS_ADDRESS)" \ --no-location \ --package-name=$(PACKAGE) \ --package-version=${VERSION} \ diff --git a/plugins/Makefile b/plugins/Makefile index f9556f9..d485068 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -34,8 +34,8 @@ pot-files: $(pck_plugins) @for f in $(pck_plugins); do\ echo -n "Generating po template '$$f.pot'...";\ /usr/bin/xgettext -i -L shell \ - --copyright-holder="Davide Madrisan" \ - --msgid-bugs-address="davide.madrisan@gmail.com" \ + --copyright-holder="$(PO_COPYRIGH_HOLDER)" \ + --msgid-bugs-address="$(PO_BUGS_ADDRESS)" \ --no-location \ --package-name=$(PACKAGE) \ --package-version=${VERSION} \ diff --git a/tests/Makefile b/tests/Makefile index f6dcd7e..879d051 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -34,8 +34,8 @@ pot-files: $(pck_tests) @for f in $(pck_tests); do\ echo -n "Generating po template '$$f.pot'...";\ /usr/bin/xgettext -i -L shell \ - --copyright-holder="Davide Madrisan" \ - --msgid-bugs-address="davide.madrisan@gmail.com" \ + --copyright-holder="$(PO_COPYRIGH_HOLDER)" \ + --msgid-bugs-address="$(PO_BUGS_ADDRESS)" \ --no-location \ --package-name=$(PACKAGE) \ --package-version=${VERSION} \