Author: pfrields
Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31472
Modified Files: Makefile.common Log Message: - Reorganize POTBASE to the top-level defines, to be sensible - Ensure ${POTBASE} is used everywhere we call the POT file
Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- Makefile.common 15 Jun 2007 19:58:50 -0000 1.165 +++ Makefile.common 22 Jun 2007 01:23:40 -0000 1.166 @@ -108,6 +108,9 @@ ifeq "${PRI_LANG}" "" PRI_LANG= en endif +ifeq "${POTBASE}" "" +POTBASE=${DOCBASE} +endif ifeq "${RPMINFO}" "" RPMINFO = rpm-info.xml endif @@ -378,15 +381,6 @@ # #########################################################################
-######################################################################### -# 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 @@ 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 @@
.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