Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11841
Modified Files:
Makefile
Log Message:
Holy smoke, it finally works!
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 29 Dec 2005 22:39:06 -0000 1.23
+++ Makefile 30 Dec 2005 07:10:10 -0000 1.24
@@ -53,7 +53,7 @@
######################################################
# Some RPM flags...
######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)"
--define "_topdir $(PWD)" --define "_rpmfilename
%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)"
--define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define
"_specdir $(PWD)"
+RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)"
--define "_topdir $(PWD)" --define "_rpmfilename
%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)"
--define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define
"_specdir $(PWD)" --define "fdpdir $(FDPDIR)"
######################################################
@@ -68,7 +68,11 @@
define fdp-info_template
fdp-info-$(1).xml::
- ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC}
../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) --stringparam lang $(1)
../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f
../docs-common/bin/xmlformat-fdp.conf > fdp-info-$(1).xml
+ ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} \
+ ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) \
+ --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl \
+ rpm-info.xml | exec $(XMLFORMAT) $(XMLFOPTS) > \
+ fdp-info-$(1).xml
sed -i 's@<!-- .*&FDP-INFO;.* -->@\&FDP-INFO;@g'
$(DOCBASE)-$(1).xml
endef
@@ -99,6 +103,7 @@
define omf_template
omf-$(1)::
+# xmllint is part of libxml2
${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \
$(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf
endef
@@ -112,14 +117,19 @@
$(DOCBASE)-$(VERSION).src.tar.gz:: clean fdp-info gnome.desktop kde.desktop
khelp.desktop omf
mkdir $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type f ! \( -name '*~' -o -name '#*' \
- -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \
+ find . -maxdepth 1 -type f ! \( -name '*~' \
+ -o -name '#*' \
+ -o -name '$(DOCBASE)*.tar.gz' \
+ -o -name '.*' \) \
| cpio -pamdv $(DOCBASE)-$(VERSION)
find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
- -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
+ -o -name 'CVS' \
+ -o -name '*~' \
+ -o -name '$(DOCBASE)*' \) \
| cpio -pamdv $(DOCBASE)-$(VERSION)
tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
rm -rf $(DOCBASE)-$(VERSION)/
+ sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\<!-- \1 - DO NOT REMOVE THIS COMMENT
--\>@g' $(DOCBASE)-*.xml
src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz
Show replies by date