diff options
| author | Paul W. Frields <stickster@gmail.com> | 2007-06-22 01:23:40 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2007-06-22 01:23:40 +0000 |
| commit | 90d0b77f46dce39eb4b7ba295405e7e158a74163 (patch) | |
| tree | 10e195fefb90bdba0fa2111beb970f70339c8693 | |
| parent | a7c0d54e2aae35a1f7e69491430128de7d37e5d3 (diff) | |
| download | fedora-doc-utils-fedora-release-notes-7.0.1-1.tar.gz fedora-doc-utils-fedora-release-notes-7.0.1-1.tar.xz fedora-doc-utils-fedora-release-notes-7.0.1-1.zip | |
- Reorganize POTBASE to the top-level defines, to be sensiblefedora-release-notes-7.0.1-1
- Ensure ${POTBASE} is used everywhere we call the POT file
| -rw-r--r-- | Makefile.common | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Makefile.common b/Makefile.common index 2dfb4f6..5f14510 100644 --- a/Makefile.common +++ b/Makefile.common @@ -108,6 +108,9 @@ endif ifeq "${PRI_LANG}" "" PRI_LANG= en endif +ifeq "${POTBASE}" "" +POTBASE=${DOCBASE} +endif ifeq "${RPMINFO}" "" RPMINFO = rpm-info.xml endif @@ -378,15 +381,6 @@ endif # ######################################################################### -######################################################################### -# Allow POT files to use a different name than the base generated name, -# if desired. This way we can generate nice "README" files from a module -# called "readme" and a "readme.pot" file, which makes l10n happier. -ifndef POTBASE -POTBASE:=${DOCBASE} -endif -showvars:: - @echo "POTBASE=${POTBASE}" ######################################################################### po/${POTBASE}.pot:: ${DOC_ENTITIES_XML-${PRI_LANG}} \ @@ -397,6 +391,9 @@ po/${POTBASE}.pot:: ${DOC_ENTITIES_XML-${PRI_LANG}} \ help:: @printf ${TFMT} 'po/${POTBASE}.pot' 'Writes one POT file for all XML' +showvars:: + @echo "POTBASE=${POTBASE}" + .PHONY: pot pot:: po/${POTBASE}.pot help:: @@ -408,12 +405,12 @@ define PO_template .PRECIOUS: po/${1}.po -po/${1}.po:: po/${DOCBASE}.pot $${DOC_ENTITITES_ENT-${1}} +po/${1}.po:: po/${POTBASE}.pot $${DOC_ENTITITES_ENT-${1}} [ -d po/CVS ] || (echo ADD po/ TO CVS >&2; exit 1) if [ ! -f $$@ ]; then \ - cp po/${DOCBASE}.pot $$@; \ + cp po/${POTBASE}.pot $$@; \ else \ - ${MSGMERGE} -U -q $$@ po/${DOCBASE}.pot; \ + ${MSGMERGE} -U -q $$@ po/${POTBASE}.pot; \ touch $$@; \ fi |