X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpkg%2Fsgml-common;h=4ab4dd69c8620e499cd4d69865dcad75abb64728;hb=7537c1f2f4728f09caee2c99f91c31ac426ed132;hp=91e66a5535c984228b28344513694d872821c046;hpb=3dae4c554ec18f465eb6ee5e6efdbdbe8557e13c;p=hvlinux.git

diff --git a/stage3/pkg/sgml-common b/stage3/pkg/sgml-common
index 91e66a5..4ab4dd6 100644
--- a/stage3/pkg/sgml-common
+++ b/stage3/pkg/sgml-common
@@ -1,49 +1,33 @@
-#!/bin/sh
-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
-
-PACKAGE=${1}
-shift
-CONFIGURE_OPTS=${*}
-
-# Applying patches (if any)
-apply_patches ${PACKAGE}
-
-CAT1="/etc/sgml/sgml-ent.cat"
-CAT2="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
-CAT3="/etc/sgml/sgml-docbook.cat"
-CAT4="/etc/sgml/sgml-ent.cat"
-
-# 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 ${CAT2} ]; then
-        ${INSTALL_CATALOG} --remove ${CAT1} ${CAT2}
-    fi
-    if [ -f ${CAT4} ]; then
-        ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4}
+#!/bin/bash
+
+hvconfig_pre()
+{
+    # This package does not distribute some autoconf files, and symlinks them
+    # to /usr/share/automake.
+    cd ${LFS_TMP}/${PACKAGE}
+    autoreconf -f -i
+
+    CAT1="/etc/sgml/sgml-ent.cat"
+    CAT2="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+
+    CAT3="/etc/sgml/sgml-docbook.cat"
+    CAT4="/etc/sgml/sgml-ent.cat"
+
+    # 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 ${CAT2} ]; then
+            ${INSTALL_CATALOG} --remove ${CAT1} ${CAT2}
+        fi
+        if [ -f ${CAT4} ]; then
+            ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4}
+        fi
     fi
-fi
-
-cd ${LFS_TMP}/${PACKAGE}
-autoreconf -f -i
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    ${CONFIGURE_OPTS}
-make
-make install
-
-${INSTALL_CATALOG} --add ${CAT1} ${CAT2}
-${INSTALL_CATALOG} --add ${CAT3} ${CAT4}
+}
 
-exit $?
+hvbuild_post()
+{
+    ${INSTALL_CATALOG} --add ${CAT1} ${CAT2}
+    ${INSTALL_CATALOG} --add ${CAT3} ${CAT4}
+}