release-notes/devel Makefile,1.8,1.9
Paul W. Frields (pfrields)
fedora-docs-commits at redhat.com
Sat Jul 15 14:05:46 UTC 2006
Author: pfrields
Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8364
Modified Files:
Makefile
Log Message:
Follow Tommy's codified rules of the road for shell variable syntax.
Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 15 Jul 2006 09:11:16 -0000 1.8
+++ Makefile 15 Jul 2006 14:05:44 -0000 1.9
@@ -9,7 +9,7 @@
DOCBASE = RELEASE-NOTES
PRI_LANG = en_US
OTHERS = #de it ja_JP pa pl pt_BR ru zh_CN
-FDPDIR = $(PWD)/../..
+FDPDIR = ${PWD}/../..
########################################################################
# List each XML file of your document in the template below. Append the
# path to each file to the "XMLFILES-${1}" string. Use a backslash if you
@@ -20,40 +20,40 @@
define XMLFILES_template
-XMLFILES-$(1)= $(1)/ArchSpecific.xml \
- $(1)/BackwardsCompatibility.xml \
- $(1)/Colophon.xml \
- $(1)/DatabaseServers.xml \
- $(1)/Desktop.xml \
- $(1)/DevelTools.xml \
- $(1)/Extras.xml \
- $(1)/Entertainment.xml \
- $(1)/Feedback.xml \
- $(1)/FileServers.xml \
- $(1)/FileSystems.xml \
- $(1)/I18n.xml \
- $(1)/Installer.xml \
- $(1)/Java.xml \
- $(1)/Kernel.xml \
- $(1)/Legacy.xml \
- $(1)/Multimedia.xml \
- $(1)/Networking.xml \
- $(1)/OverView.xml \
- $(1)/PackageChanges.xml \
- $(1)/PackageNotes.xml \
- $(1)/Printing.xml \
- $(1)/ProjectOverview.xml \
- $(1)/RELEASE-NOTES.xml \
- $(1)/Samba.xml \
- $(1)/Security.xml \
- $(1)/ServerTools.xml \
- $(1)/SystemDaemons.xml \
- $(1)/Virtualization.xml \
- $(1)/WebServers.xml \
- $(1)/Welcome.xml \
- $(1)/Xorg.xml \
- $(1)/about-fedora.xml \
- $(1)/README.xml
+XMLFILES-${1}= ${1}/ArchSpecific.xml \
+ ${1}/BackwardsCompatibility.xml \
+ ${1}/Colophon.xml \
+ ${1}/DatabaseServers.xml \
+ ${1}/Desktop.xml \
+ ${1}/DevelTools.xml \
+ ${1}/Extras.xml \
+ ${1}/Entertainment.xml \
+ ${1}/Feedback.xml \
+ ${1}/FileServers.xml \
+ ${1}/FileSystems.xml \
+ ${1}/I18n.xml \
+ ${1}/Installer.xml \
+ ${1}/Java.xml \
+ ${1}/Kernel.xml \
+ ${1}/Legacy.xml \
+ ${1}/Multimedia.xml \
+ ${1}/Networking.xml \
+ ${1}/OverView.xml \
+ ${1}/PackageChanges.xml \
+ ${1}/PackageNotes.xml \
+ ${1}/Printing.xml \
+ ${1}/ProjectOverview.xml \
+ ${1}/RELEASE-NOTES.xml \
+ ${1}/Samba.xml \
+ ${1}/Security.xml \
+ ${1}/ServerTools.xml \
+ ${1}/SystemDaemons.xml \
+ ${1}/Virtualization.xml \
+ ${1}/WebServers.xml \
+ ${1}/Welcome.xml \
+ ${1}/Xorg.xml \
+ ${1}/about-fedora.xml \
+ ${1}/README.xml
endef
@@ -72,8 +72,8 @@
# echo FINISHED AT LAST
########################################################################
define HACK_FDP_template
-$(1)/fdp-info.xml::
- sed -i 's#legalnotice-opl#legalnotice-relnotes#g' $(1)/fdp-info.xml
+${1}/fdp-info.xml::
+ sed -i 's#legalnotice-opl#legalnotice-relnotes#g' ${1}/fdp-info.xml
endef
$(foreach L,${LANGUAGES},$(eval $(call HACK_FDP_template,${L})))
@@ -89,18 +89,18 @@
readme-${1}:: README-${1}.txt
README-${1}.txt:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}}
- LANG=$(1).UTF-8 ${XMLLINT} ${XMLLINTOPT} $(1)/README.xml > \
- $(1)/README.lint.xml
- LANG=$(1).UTF-8 ${XSLTPROC} \
- $(FDPDIR)/docs-common/packaging/strip-for-txt.xsl \
- $(1)/README.lint.xml > $(1)/README.stripped.xml && \
- rm $(1)/README.lint.xml
- LANG=$(1).UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt \
- $(1)/README.stripped.xml && \
- move-if-change README.stripped.txt README-$(1).txt
+ LANG=${1}.UTF-8 ${XMLLINT} ${XMLLINTOPT} ${1}/README.xml > \
+ ${1}/README.lint.xml
+ LANG=${1}.UTF-8 ${XSLTPROC} \
+ ${FDPDIR}/docs-common/packaging/strip-for-txt.xsl \
+ ${1}/README.lint.xml > ${1}/README.stripped.xml && \
+ rm ${1}/README.lint.xml
+ LANG=${1}.UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt \
+ ${1}/README.stripped.xml && \
+ move-if-change README.stripped.txt README-${1}.txt
clean::
- $(RM) -rf README-$(1).txt
+ ${RM} -rf README-${1}.txt
endef
@@ -119,28 +119,28 @@
define PKG_template
.PHONY: release-pkg-${1}
-release-pkg-${1}:: release-notes-$(VERSION)/$(DOCBASE)-$(1).html \
- release-notes-$(VERSION)/$(DOCBASE)-$(1).txt \
- release-notes-$(VERSION)/README-$(1).txt
+release-pkg-${1}:: release-notes-${VERSION}/${DOCBASE}-${1}.html \
+ release-notes-${VERSION}/${DOCBASE}-${1}.txt \
+ release-notes-${VERSION}/README-${1}.txt
-release-notes-$(VERSION)/$(DOCBASE)-$(1).html:: html-nochunks-${1}
- cp ${DOCBASE}-$(1).html $$@
+release-notes-${VERSION}/${DOCBASE}-${1}.html:: html-nochunks-${1}
+ cp ${DOCBASE}-${1}.html $$@
-release-notes-$(VERSION)/$(DOCBASE)-$(1).txt:: txt-${1}
+release-notes-${VERSION}/${DOCBASE}-${1}.txt:: txt-${1}
cp ${DOCBASE}-${1}.txt $$@
-release-notes-$(VERSION)/README-$(1).txt:: readme-${1}
- cp README-$(1).txt $$@
+release-notes-${VERSION}/README-${1}.txt:: readme-${1}
+ cp README-${1}.txt $$@
ifeq "${1}" "en_US"
-release-pkg-${1}:: release-notes-$(VERSION)/about/${1}/about-fedora.xml
-release-notes-$(VERSION)/about/${1}/about-fedora.xml:: xml-${1}
- mkdir -p release-notes-$(VERSION)/about/C
+release-pkg-${1}:: release-notes-${VERSION}/about/${1}/about-fedora.xml
+release-notes-${VERSION}/about/${1}/about-fedora.xml:: xml-${1}
+ mkdir -p release-notes-${VERSION}/about/C
cp ${1}/about-fedora.xml $$@
else
-release-pkg-${1}:: release-notes-$(VERSION)/about/C/about-fedora.xml
-release-notes-$(VERSION)/about/C/about-fedora.xml:: xml-${1}
- mkdir -p release-notes-$(VERSION)/about/${1}
+release-pkg-${1}:: release-notes-${VERSION}/about/C/about-fedora.xml
+release-notes-${VERSION}/about/C/about-fedora.xml:: xml-${1}
+ mkdir -p release-notes-${VERSION}/about/${1}
cp ${1}/about-fedora.xml $$@
endif
@@ -150,8 +150,8 @@
.PHONY: release-pkg
release-pkg:: $(foreach LANG,${LANGUAGES},release-pkg-${LANG})
- tar czf release-notes-$(VERSION).tar.gz release-notes-$(VERSION)
+ tar czf release-notes-${VERSION}.tar.gz release-notes-${VERSION}
clean::
- ${RM} -rf release-notes-$(VERSION).tar.gz
- ${RM} -rf release-notes-$(VERSION)
+ ${RM} -rf release-notes-${VERSION}.tar.gz
+ ${RM} -rf release-notes-${VERSION}
More information about the Fedora-docs-commits
mailing list