X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=8c049cd4ddcdac7cbfe5225f72eb5cf466a829b0;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=d9cf9d006e4956ab29c3a534d5d271c0dda3f3b1;hpb=77031e8fcef84bf8d3980c9540ef5be53b636186;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d9cf9d0..8c049cd 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -8,6 +8,10 @@ init_log_file
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
+
+ipkg ${FOOMATIC_FILTERS}
+ipkg -m noac ${FOO2ZJS}
+
 ipkg -m acnb ${CUPS}
 ipkg -m noac ${CUPS_PDF}
 ipkg -m noac ${SPLIX}
@@ -117,8 +121,15 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg -m acnb ${EASYTAG}
-        ipkg -m acnb ${FONTFORGE}
-        ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
+        ipkg -m acnb ${FONTFORGE} "--enable-double"
+
+        # -Wno-error=unused-but-set-variable: Fix for newer GCC.
+        CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" \
+            ipkg -s guile1 ${GUILE1}
+
+        # Lilypond 2.17 ne fonctionne pas encore avec guile2
+        PATH="/opt/guile1/bin/:$PATH" \
+            ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
         # ChordPro utils
         ipkg -m noac ${CHORDPACK}
@@ -173,6 +184,10 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
+ipkg -s apache ${HTTPD} # Apache
+ipkg ${LIGHTTPD}
+ipkg ${PHP}
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -193,18 +208,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     ipkg ${UW_IMAP}
 
-    ipkg ${HTTPD} # Apache
-    ipkg ${PHP}
-
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
     # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-fi
 
-if [ "x${INST_TYPE}" = "xworkstation" -o \
-    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LIBGSF}
     ipkg -m acnb ${GOFFICE}
     ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"