-Déplacé nano du stage3 au stage 2 (car causait problème vu qu'on enlève /tools à...

[hvlinux.git] / stage4 / stage4-install

diff --git a/stage4/stage4-install b/stage4/stage4-install
index fee1687..73f2c71 100755 (executable)
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -70,11 +70,12 @@ install_xorg_modules()
             libX11-[0-9]* )
                 MY_XORG_CONFIG="--without-xcb"
                 ;;
-            xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
-                #for file in `grep -Rl "xf86Version.h" *`; do
-                #    sed 's@xf86Version.h@xorgVersion.h@g' -i "$file"
-                #done
-                #;;
+            libXt-[0-9]* )
+                MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults"
+                ;;
+            xinit-[0-9]* )
+                MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls"
+                ;;
         esac
 
         ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
@@ -126,10 +127,11 @@ ipkg_ac   ${HAL_INFO}
 ipkg_xorg ${XORG_SERVER} "xserver" "\
     --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
-    --enable-install-setuid"
+    --enable-install-setuid \
+    --disable-config-hal"
 
 # newport, vmware, and xgixp drivers cause Xorg -configure to hang
-# To fix this problrem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
+# To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
 install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
 
 ipkg_xorg ${XDM} "app"
@@ -145,7 +147,7 @@ ipkg_cust ${TK}  cis-tk
 # Re-installing python now that tk is present???
 ipkg_ac   ${PYTHON} "--enable-shared"
 
-ipkg_ac   ${WINDOWMAKER} --with-gnustepdir=/usr/share/GNUstep
+ipkg_cust ${WINDOWMAKER} cis-windowmaker
 ipkg_ac   ${WINDOWMAKER_EXTRA}
 
 #source /etc/profile