X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-opensp;h=577a8f7c405eb179219a7c97474b082a408b2b0c;hb=5f02c8c4b5fe6640bcdb61d1006256289a57c222;hp=9860a5e72efae92646f1e055be23d7d2f7cfaab0;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-opensp b/stage3/cis-opensp
index 9860a5e..577a8f7 100755
--- a/stage3/cis-opensp
+++ b/stage3/cis-opensp
@@ -1,55 +1,60 @@
 #!/bin/sh
-# First argument of this script is the package name
+
+set -o errexit
+
+# First argument of this script is the package name.
+# Remaining arguments are additional configure options.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
-# Remove the old catalog items prior to upgrading...
-# First test for presence of 'install-catalog' program
-install-catalog -v 1> /dev/null 2>&1
-if [ $? -eq 0 ]; then
-    # The following commands may fail if this is the first time
-    # that this package is installed. So we do not check the return value.
-    install-catalog --remove /etc/sgml/${1}.cat \
-	/usr/share/sgml/${1}/catalog
-    install-catalog --remove /etc/sgml/sgml-docbook.cat \
-	/etc/sgml/${1}.cat
-fi
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
+
+CAT1="/etc/sgml/${PACKAGE}.cat"
+CAT2="/usr/share/sgml/${PACKAGE}/catalog"
 
+CAT3="/etc/sgml/sgml-docbook.cat"
+CAT4="/etc/sgml/${PACKAGE}.cat"
 
-cd ${LFS_TMP}/${1} &&
+# Remove the old catalog items prior to upgrading...
+# First test for presence of 'install-catalog' program
+INSTALL_CATALOG=/usr/bin/install-catalog
+if [ -x ${INSTALL_CATALOG} ]; then
+    if [ -f ${CAT1} ]; then
+        ${INSTALL_CATALOG} --remove ${CAT1} ${CAT2}
+    fi
+    if [ -f ${CAT4} ]; then
+        ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4}
+    fi
+fi
 
-# These seds prevent some annoying messages that may otherwise appear while running openjade.
-sed -i 's:32,:253,:' lib/Syntax.cxx &&
+cd ${LFS_TMP}/${PACKAGE}
+sed -i 's:32,:253,:' lib/Syntax.cxx
 sed -i 's:LITLEN          240 :LITLEN          8092:' \
-    unicode/{gensyntax.pl,unicode.syn} &&
+    unicode/{gensyntax.pl,unicode.syn}
 ./configure \
     --prefix=/usr \
     --disable-static \
     --disable-doc-build \
-    --enable-http \
     --enable-default-catalog=/etc/sgml/catalog \
-    --enable-default-search-path=/usr/share/sgml &&
-make pkgdatadir=/usr/share/sgml/${1} &&
-make pkgdatadir=/usr/share/sgml/${1} install &&
-ln -sf onsgmls /usr/bin/nsgmls &&
-ln -sf osgmlnorm /usr/bin/sgmlnorm &&
-ln -sf ospam /usr/bin/spam &&
-ln -sf ospcat /usr/bin/spcat &&
-ln -sf ospent /usr/bin/spent &&
-ln -sf osx /usr/bin/sx &&
-ln -sf osx /usr/bin/sgml2xml &&
-ln -sf libosp.so /usr/lib/libsp.so
-
-#install-catalog --add /etc/sgml/${1}.cat \
-#    /usr/share/sgml/${1}/catalog &&
-#install-catalog --add /etc/sgml/sgml-docbook.cat \
-#    /etc/sgml/${1}.cat
-
-# Return last error
+    --enable-http \
+    --enable-default-search-path=/usr/share/sgml
+make pkgdatadir=/usr/share/sgml/${PACKAGE}
+make pkgdatadir=/usr/share/sgml/${PACKAGE} install
+ln -v -sf onsgmls /usr/bin/nsgmls
+ln -v -sf osgmlnorm /usr/bin/sgmlnorm
+ln -v -sf ospam /usr/bin/spam
+ln -v -sf ospcat /usr/bin/spcat
+ln -v -sf ospent /usr/bin/spent
+ln -v -sf osx /usr/bin/sx
+ln -v -sf osx /usr/bin/sgml2xml
+ln -v -sf libosp.so /usr/lib/libsp.so
+
 exit $?