X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fcis-ghostscript;h=bc26a6c929a76bb1cddf8b213157f6ea2f343c37;hb=4a5ee11082298504fcc354313da66e3bc89171eb;hp=2ae788bac800e10fc2ca51ccd5df8aae50c72548;hpb=532a0d1a77242192d6809b03ec7c14e271e29e82;p=hvlinux.git

diff --git a/stage5/cis-ghostscript b/stage5/cis-ghostscript
index 2ae788b..bc26a6c 100755
--- a/stage5/cis-ghostscript
+++ b/stage5/cis-ghostscript
@@ -8,10 +8,40 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
+GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript"
+
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1}
+apply_patches ${PACKAGE}
 
-GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript"
+cd ${LFS_TMP}/${PACKAGE}
+
+# To use the system-installed version of JasPer:
+rm -rf jasper
+
+# To use the system-installed copies of libjpeg and libpng:
+rm -rf jpeg
+rm -rf libpng
+
+# To use the system-installed copy of libtiff:
+rm -rf tiff
+
+./configure \
+    --prefix=/usr \
+    --enable-dynamic \
+    --with-system-libtiff \
+    --with-fontpath=${GS_FONTS_PATH}
+make
+make install docdir=/usr/share/doc/${PACKAGE}
+
+# To install the shared library libgs.so (needed by libspectre)
+make so
+make soinstall docdir=/usr/share/doc/${PACKAGE}
+install -v -m644 base/*.h /usr/include/ghostscript
+ln -v -s ghostscript /usr/include/ps
 
 # Unpack all the fonts to ${GS_FONTS_PATH}
 install -v -m755 -d ${GS_FONTS_PATH}
@@ -21,24 +51,6 @@ mv ${LFS_TMP}/fonts/* ${GS_FONTS_PATH}
 rmdir ${LFS_TMP}/fonts
 chown -v -R root:root ${GS_FONTS_PATH}
 
-cd ${LFS_TMP}/${1}
-sed -i "s/bbox.dev$/x11.dev/" Makefile.in
-./configure \
-    --prefix=/usr \
-    --enable-threads \
-    --without-omni \
-    --with-fontpath=${GS_FONTS_PATH}
-make
-make install
-
-#rmdir -v /usr/lib/ghostscript/$(get_pkg_ver_base ${1}) /usr/lib/ghostscript
-ln -v -s ../ghostscript/$(get_pkg_ver_base ${1})/doc /usr/share/doc/${1}
-for INSTFILE in `ls doc`; do
-    if [ ! -f /usr/share/doc/${1}/${INSTFILE} ]; then
-	install -v -m644 doc/${INSTFILE} /usr/share/doc/${1}/
-    fi
-done
-
 if ! grep "${GS_FONTS_PATH}" /etc/fonts/local.conf 1> /dev/null 2>&1; then
     # Adding Ghostscript fonts directory to local configuration file
     sed -i -e "s!\(</fontconfig>\)!    <dir>${GS_FONTS_PATH}</dir>\n\1!" /etc/fonts/local.conf