extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-23 22:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

More build44 fixes

Browse Source
This commit is contained in:
Tom Eastep 2009-05-11 15:45:35 -07:00
parent f75f4158b3
commit a513809103
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/build/build44
View File

@ -187,8 +187,8 @@ do_buildanrpm() {
progress_message "Building ${1}..." progress_message "Building ${1}..."
cd /tmp cd /tmp
rm -rf ${1}-${BASEVERSION} rm -rf ${2}-${BASEVERSION}
do_or_die "cp -a $DIR/$SHOREWALLDIR ${2}-${BASEVERSION}" do_or_die "cp -a $DIR/${3} ${2}-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/${2}-${BASEVERSION}.tgz ${2}-${BASEVERSION}" do_or_die "tar -zcf $RPMDIR/SOURCES/${2}-${BASEVERSION}.tgz ${2}-${BASEVERSION}"
cd $DIR cd $DIR
do_or_die "cp ${3}/${2}.spec $RPMDIR/SPECS/" do_or_die "cp ${3}/${2}.spec $RPMDIR/SPECS/"
@ -227,8 +227,6 @@ do_manpages()
do_export ${1} manpages do_export ${1} manpages
cd manpages cd manpages
pattern="*.conf.*|shorewall${2}.xml"
for f in *.xml; do for f in *.xml; do
case $f in case $f in
*template.xml) *template.xml)
@ -237,14 +235,13 @@ do_manpages()
progress_message "Generating Man Page from $f..." progress_message "Generating Man Page from $f..."
do_or_die "xmlto --skip-validation --xsltopts "--stringparam" --xsltopts "man.base.url.for.relative.links" --xsltopts $BASEURL/manpages${3}/ man $f >> $LOGFILE 2>&1" do_or_die "xmlto --skip-validation --xsltopts "--stringparam" --xsltopts "man.base.url.for.relative.links" --xsltopts $BASEURL/manpages${3}/ man $f >> $LOGFILE 2>&1"
case $f in case $f in
$pattern) *.conf.*|shorewall.xml|shorewall6.xml|shorewall-lite.xml|shorewall6-lite.xml)
;; ;;
*) *)
g=${f#shorewall${2}-} g=${f#shorewall${2}-}
h=$(ls ${g%.xml}.[58]) h=$(ls ${g%.xml}.[58])
f=shorewall${2}-$h f=shorewall${2}-$h
mv $h $f mv $h $f
progress_message "Moved $h to $f"
;; ;;
esac esac