Remplacement agg par cairo avec gnash

[hvlinux.git] / stage5 / pkg / ghostscript

diff --git a/stage5/pkg/ghostscript b/stage5/pkg/ghostscript
index 242d9a3..ac2d5b5 100644 (file)
--- a/stage5/pkg/ghostscript
+++ b/stage5/pkg/ghostscript
@@ -23,29 +23,27 @@ hvconfig_pre()
         --with-fontpath=${GS_FONTS_PATH}"
 }
 
-hvbuil()
+hvbuild()
 {
     make
     make install docdir=/usr/share/doc/${PACKAGE}
 }
 
-hvbuil_post()
+hvbuild_post()
 {
     # 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
+    ln -svf ghostscript /usr/include/ps
 
     # Unpack all the fonts to ${GS_FONTS_PATH}
     install -v -m755 -d ${GS_FONTS_PATH}
-    decompress_package ${GHOSTSCRIPT_FONTS_STD}
-    decompress_package ${GHOSTSCRIPT_FONTS_OTHER}
-    mv ${LFS_TMP}/fonts/* ${GS_FONTS_PATH}
-    rmdir ${LFS_TMP}/fonts
+    decompress_package ${GHOSTSCRIPT_FONTS_STD}   ${GS_FONTS_PATH} 1
+    decompress_package ${GHOSTSCRIPT_FONTS_OTHER} ${GS_FONTS_PATH} 1
     chown -v -R root:root ${GS_FONTS_PATH}
     
-    if ! grep "${GS_FONTS_PATH}" /etc/fonts/local.conf 1> /dev/null 2>&1; then
+    if ! grep -q "${GS_FONTS_PATH}" /etc/fonts/local.conf; 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