From ffaf6b84d9a3820d538e2d20df0e19e7fd0607d8 Mon Sep 17 00:00:00 2001
From: ddomingo <ddomingo@redhat.com>
Date: Wed, 28 Jan 2009 11:24:31 +1000
Subject: cleaner versions

---
 doc/SystemTap_Beginners_Guide/Makefile        |  4 +++-
 doc/SystemTap_Beginners_Guide/syncandbuild.sh | 20 ++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'doc/SystemTap_Beginners_Guide')

diff --git a/doc/SystemTap_Beginners_Guide/Makefile b/doc/SystemTap_Beginners_Guide/Makefile
index f77f047e..3dbded40 100644
--- a/doc/SystemTap_Beginners_Guide/Makefile
+++ b/doc/SystemTap_Beginners_Guide/Makefile
@@ -17,4 +17,6 @@ pre::
 	cp -a ../../testsuite en-US/extras/;
 
 post::
-	rm -rf en-US/extras/testsuite
\ No newline at end of file
+	rm -rf en-US/extras/testsuite
+	sed -i -e 's/<productname>Fedora/<productname>Red Hat Enterprise Linux/g' en-US/Book_Info.xml;
+	sed -i -e 's/<productnumber>10/<productnumber>5/g' en-US/Book_Info.xml;
\ No newline at end of file
diff --git a/doc/SystemTap_Beginners_Guide/syncandbuild.sh b/doc/SystemTap_Beginners_Guide/syncandbuild.sh
index 566921c9..e6a6c1f4 100755
--- a/doc/SystemTap_Beginners_Guide/syncandbuild.sh
+++ b/doc/SystemTap_Beginners_Guide/syncandbuild.sh
@@ -1,28 +1,24 @@
 #!/bin/bash
 # Instead of running the original makefile to build the document, run this script instead
-echo -n "Please specify your build target (e.g. html-en-US, pdf-en-US, etc)	"
+echo -n "Please specify your build target (e.g. html, pdf, or html-single)	"
 read TARG
-echo -n "Please specify the product you are building for: enter 1 for Fedora, 2 for RHEL	"
+echo -n "Please specify the product you are building for (enter 1 for Fedora, 2 for RHEL)	"
 read PROD
-echo -n "Thank you. Now specify any build parameters you'd like to use (skip this step for none).	"
+echo -n "Please specify any build parameters you'd like to use (skip this step for none).	"
 read PARM
 
-cp -a ../../testsuite  en-US/extras/.
-
 if [ $PROD = 1 ]; 
-	then 	
+then 	
 	sed -i -e 's/<productname>Red Hat Enterprise Linux/<productname>Fedora/g' en-US/Book_Info.xml;
 	sed -i -e 's/<productnumber>5/<productnumber>10/g' en-US/Book_Info.xml;
 	sed -i -e 's/BRAND = RedHat/BRAND = fedora/g' Makefile;
-	make $PARM $TARG
+	make $PARM $TARG-en-US post
 
-else make $PARM $TARG
+else 
+sed -i -e 's/BRAND = fedora/BRAND = RedHat/g' Makefile;	
+make post $PARM $TARG-en-US
 fi
 
-echo "Setting default brand back to RHEL (if needed)..." 
-	sed -i -e 's/<productname>Fedora/<productname>Red Hat Enterprise Linux/g' en-US/Book_Info.xml;
-	sed -i -e 's/<productnumber>10/<productnumber>5/g' en-US/Book_Info.xml;
-	sed -i -e 's/BRAND = fedora/BRAND = RedHat/g' Makefile;	
 echo "done."
 echo "Cleaning sync'd files..."
 make post
-- 
cgit