From 6fb1d84087721576b23c7d9a2e7ea6b23054a937 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 27 Aug 2006 21:35:22 +0000 Subject: Comment out broken OMF stuff, and add some useful showvars debugging --- Makefile.common | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index 6b689b0..258382e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -253,6 +253,10 @@ distclean:: clean # ######################################################################### +showvars:: + @echo "XMLFILES=${XMLFILES-${PRI_LANG}}" + @echo "XMLDEPFILES=${XMLDEPFILES-${PRI_LANG}}" + ######################################################################### # Obtain the document version and release info for building RPM's SPECFILE=$(firstword $(wildcard *.spec)) @@ -881,33 +885,33 @@ fedora-doc-${DOCBASE}-khelp.desktop:: ${RPMINFO} ${FDPDIR}/docs-common/packaging/khelpcenter-plugin.xsl \ ${RPMINFO} >$@.tmp && move-if-change $@.tmp $@ -define omf_template -omf-$(1):: fedora-doc-${DOCBASE}-$(1).omf - -fedora-doc-${DOCBASE}-$(1).omf:: ${1}/${RPMINFO} - LANG=$(1).UTF-8 ${XSLTPROC} --stringparam docbase "${DOCBASE}" \ - --stringparam lang "$(1)" \ - ${FDPDIR}/docs-common/packaging/omf.xsl ${1}/${RPMINFO} | \ - $(XMLFORMAT) $(XMLFOPTS) >fedora-doc-${DOCBASE}-$(1).omf.tmp && \ - move-if-change fedora-doc-${DOCBASE}-$(1).omf.tmp fedora-doc-${DOCBASE}-$(1).omf - -help:: - @printf ${TFMT} 'omf-${1}' 'OMF file for locale ${1}' - @printf ${TFMT} 'fedora-doc-${DOCBASE}-${1}.omf' 'OMF file for locale ${1}' -endef +#define omf_template +#omf-$(1):: fedora-doc-${DOCBASE}-$(1).omf +# +#fedora-doc-${DOCBASE}-$(1).omf:: ${1}/${RPMINFO} +# LANG=$(1).UTF-8 ${XSLTPROC} --stringparam docbase "${DOCBASE}" \ +# --stringparam lang "$(1)" \ +# ${FDPDIR}/docs-common/packaging/omf.xsl ${1}/${RPMINFO} | \ +# $(XMLFORMAT) $(XMLFOPTS) >fedora-doc-${DOCBASE}-$(1).omf.tmp && \ +# move-if-change fedora-doc-${DOCBASE}-$(1).omf.tmp fedora-doc-${DOCBASE}-$(1).omf -help:: - @printf ${TFMT} 'fedora-doc-${DOCBASE}-C.omf' 'Locale "EN" not the C locale' +#help:: +# @printf ${TFMT} 'omf-${1}' 'OMF file for locale ${1}' +# @printf ${TFMT} 'fedora-doc-${DOCBASE}-${1}.omf' 'OMF file for locale ${1}' +#endef -fedora-doc-${DOCBASE}-C.omf:: fedora-doc-${DOCBASE}-en_US.omf - cp fedora-doc-$(DOCBASE)-en_US.omf $@ +#help:: +# @printf ${TFMT} 'fedora-doc-${DOCBASE}-C.omf' 'Locale "EN" not the C locale' -$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG}))) +#fedora-doc-${DOCBASE}-C.omf:: fedora-doc-${DOCBASE}-en_US.omf +# cp fedora-doc-$(DOCBASE)-en_US.omf $@ -help:: - @printf ${TFMT} 'omf' 'Generates the OMF files' +#$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG}))) -omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG)) fedora-doc-${DOCBASE}-C.omf +#help:: +# @printf ${TFMT} 'omf' 'Generates the OMF files' +# +#omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG)) fedora-doc-${DOCBASE}-C.omf ######################################################################### -- cgit