From e7687575733ea741e7f89d415b5455d70bd540db Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Sun, 15 Jan 2006 23:26:25 +0000
Subject: Use xmlformat-fdp.conf options properly in functions

---
 bin/fdp-functions    | 4 +++-
 bin/insert-changelog | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/fdp-functions b/bin/fdp-functions
index a1f2c74..320a6af 100644
--- a/bin/fdp-functions
+++ b/bin/fdp-functions
@@ -9,7 +9,9 @@ FDPBINDIR="${FDPDIR}/docs-common/bin"
 FDPPKGDIR="${FDPDIR}/docs-common/packaging"
 RPMINFO=${RPMINFO:-"rpm-info.xml"}
 XSLTPROC=${XSLTPROC:-xsltproc}
-XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat" -f "${FDPBINDIR}/xmlformat-fdp.conf"}
+XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
+XMLFOPTS=${XMLFOPTS:-"-f ${FDPBINDIR}/xmlformat-fdp.conf"}
+
 
 get_all_workers()
 {
diff --git a/bin/insert-changelog b/bin/insert-changelog
index 33045b1..3a7a8db 100755
--- a/bin/insert-changelog
+++ b/bin/insert-changelog
@@ -5,7 +5,6 @@
 
 . "$(dirname $0)/fdp-functions"
 
-RPMINFO="rpm-info.xml"
 OUTPUT="${1:-${PWD}/$RPMINFO.clog$$}"
 
 echo -n "Change to [r]pm package or [d]ocument source? [r/D] "
@@ -62,5 +61,5 @@ ${XSLTPROC} --stringparam role "$ROLE" \
     --stringparam date "$REVDATE" \
     --stringparam detail "$DETAILS" \
     ../docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
-    ${XMLFORMAT} > ${OUTPUT}
+    ${XMLFORMAT} ${XMLFOPTS} > ${OUTPUT}
 echo "New $RPMINFO written to $OUTPUT"
-- 
cgit