docs-common Makefile.common,1.27,1.28

Paul W. Frields (pfrields) fedora-docs-commits at redhat.com
Sun Jan 15 22:46:57 UTC 2006


Author: pfrields

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26327/docs-common

Modified Files:
	Makefile.common 
Log Message:
Make it possible to use alternate rpm-info.xml file if needed


Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.common	12 Jan 2006 18:18:18 -0000	1.27
+++ Makefile.common	15 Jan 2006 22:46:50 -0000	1.28
@@ -52,6 +52,9 @@
 ifeq	(${HTMLCSSEXTRA},)
 HTMLCSSEXTRA	= ${FDPDIR}/docs-common/images/watermark-${LANG}.png
 endif
+ifeq	(${RPMINFO},)
+RPMINFO		= ${PWD}/rpm-info.xml
+endif
 #########################################################################
 # Define a macro to locate xmlto(1) so we can choose a specific version
 # by "make XMLTO=/path/to/xmlto", if we so desire.
@@ -193,13 +196,13 @@
 # "rpm-info.xml" file.
 #
 define fdp-info_template
-fdp-info-$(1).xml::	rpm-info.xml
+fdp-info-$(1).xml::	$(RPMINFO)
 	${XSLTPROC} --stringparam lang $(1)				\
 		--stringparam doctype $(shell				\
 			${FDPDIR}/docs-common/packaging/doctype 	\
 			$(DOCBASE)-$(1).xml				\
 		) ${FDPDIR}/docs-common/packaging/bookinfo.xsl 		\
-		rpm-info.xml 					| 	\
+		$(RPMINFO) 					| 	\
 	$(XMLFORMAT) $(XMLFOPTS) > fdp-info-$(1).xml
 endef
 #
@@ -208,5 +211,14 @@
 fdp-info::  $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
 #
 #########################################################################
+# Make a new changelog entry for an existing rpm-info.xml file.
+
+clog:: $(RPMINFO)
+	XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
+		${FDPBIN}/insert-changelog $(RPMINFO).clog
+	mv -b $(RPMINFO).clog $(RPMINFO)
+
+#
+#########################################################################
 # End of Makefile.common
 #########################################################################




More information about the Fedora-docs-commits mailing list