Enlevé variable GNOME2_PREFIX, car on installe gnome dans /usr

diff --git a/config/packages-list b/config/packages-list
index 61f380ea02474b1851d75d6577f603ee58cc2b26..0473354b2465c5b445de5ca4adf71546f0a15b83 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -122,7 +122,6 @@ GPERF="gperf-3.0.4"
 
 # GNOME2 core packages
 GNOME2_VER="gnome-2.28.1"
-GNOME2_PREFIX="/opt/${GNOME2_VER}"
 ORBIT2="ORBit2-2.14.19"
 LIBBONOBO="libbonobo-2.24.2"
 GCONF="GConf-2.32.3"

diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64
index 5b9a621ed55ba12039d16b5d247f642f3ccb1117..2ba0774ca95dbfe9e5b9312ebfa115b3144b1e5c 100644 (file)
--- a/config/sysinfos.amd64
+++ b/config/sysinfos.amd64
@@ -37,4 +37,4 @@ BOOTPROTO[0]="dhcp"
 USE_SAMBA="no"
 
 # Override some packages
-#KERNEL="${NOUVEAU_NVIDIA_KERNEL}"
+KERNEL="${NOUVEAU_NVIDIA_KERNEL}"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 8e4f869d8bb3ffebafac6cfc54a00cd47da7d60c..0a3a94d0b8db07b794ffd3f8ec6b82aa36015a67 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -49,6 +49,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     rscr mult "Configuring ${GNOME2_VER}" gnome-config
     source /etc/profile
 
+    echo "Test"
+    exit 0
+
     ipkg_gnome ${ORBIT2}
     ipkg ${GCONF}
     ipkg ${LIBPROXY} "--with-gnome"

diff --git a/stage5/pkg/gnome b/stage5/pkg/gnome
index a5c103ec1ddc560286e03bc8732bf93f40ed1fd4..b45fe9415b1028b71085daeef3c1cbf37e9fb15c 100644 (file)
--- a/stage5/pkg/gnome
+++ b/stage5/pkg/gnome
@@ -3,9 +3,9 @@
 hvconfig_pre()
 {
     CONFIGURE_OPTS=" \
-        --prefix=${GNOME2_PREFIX} \
-        --libexecdir=${GNOME2_PREFIX}/sbin \
-        --sysconfdir=/etc/gnome/${GNOME2_VER} \
+        --prefix=/usr \
+        --libexecdir=/usr/sbin \
+        --infodir=/usr/share/info \
         --localstatedir=/var/lib \
-        --infodir=${GNOME2_PREFIX}/share/info"
+        --sysconfdir=/etc/gnome/${GNOME2_VER}"
 }

diff --git a/stage5/pkg/gnome-nobuild b/stage5/pkg/gnome-nobuild
index 9a9d29346af32e592dd9108f814d5b8da78d5523..b45fe9415b1028b71085daeef3c1cbf37e9fb15c 100644 (file)
--- a/stage5/pkg/gnome-nobuild
+++ b/stage5/pkg/gnome-nobuild
@@ -3,9 +3,9 @@
 hvconfig_pre()
 {
     CONFIGURE_OPTS=" \
-        --prefix=${GNOME2_PREFIX} \
-        --libexecdir=${GNOME2_PREFIX}/sbin \
-        --infodir=${GNOME2_PREFIX}/share/info \
+        --prefix=/usr \
+        --libexecdir=/usr/sbin \
+        --infodir=/usr/share/info \
         --localstatedir=/var/lib \
         --sysconfdir=/etc/gnome/${GNOME2_VER}"
 }

diff --git a/stage6/pkg/gal b/stage6/pkg/gal
index 83b0f5a975c3c0f357228cb8cded611f4acf3895..9b84b1990379cf7a01896b09ed700b188e0c517c 100644 (file)
--- a/stage6/pkg/gal
+++ b/stage6/pkg/gal
@@ -18,10 +18,10 @@ sed -i -e "s/gal-decl/gal-2.4-decl/" \
 
 cd ${LFS_TMP}/${1}-build &&
 ../${1}/configure \
-    --prefix=${GNOME2_PREFIX} \
-    --libexecdir=${GNOME2_PREFIX}/sbin \
+    --prefix=/usr \
+    --libexecdir=/usr/sbin \
     --localstatedir=/var/lib \
-    --infodir=${GNOME2_PREFIX}/share/info \
+    --infodir=/usr/share/info \
     --sysconfdir=/etc/gnome/${GNOME2_VER} &&
 make &&
 make install &&

diff --git a/stage6/pkg/gdm b/stage6/pkg/gdm
index 804dba877895155f20cc25adf4f9098d1003e462..087c2416d253b982349a649aa86a5551197c53e3 100644 (file)
--- a/stage6/pkg/gdm
+++ b/stage6/pkg/gdm
@@ -15,10 +15,10 @@ hv_useradd -c "GDM_Daemon_Owner" -d /dev/null -g gdm -s /bin/bash -u 21 gdm &&
 CFLAGS="${CFLAGS} -ldl"
 cd ${LFS_TMP}/${1}-build &&
 ../${1}/configure \
-    --prefix=${GNOME2_PREFIX} \
-    --libexecdir=${GNOME2_PREFIX}/sbin \
+    --prefix=/usr \
+    --libexecdir=/usr/sbin \
     --localstatedir=/var/lib \
-    --infodir=${GNOME2_PREFIX}/share/info \
+    --infodir=/usr/share/info \
     --with-pam-prefix=/etc \
     --sysconfdir=/etc/gnome/${GNOME2_VER} &&
 make &&

diff --git a/stage6/pkg/gnome-applets b/stage6/pkg/gnome-applets
index f473fafeb2d51ee16e8d8146baa0fbfd58e66966..50b7913b6c906d13c0e90a032d03e806254f1228 100644 (file)
--- a/stage6/pkg/gnome-applets
+++ b/stage6/pkg/gnome-applets
@@ -11,9 +11,9 @@ apply_patches ${1} &&
 
 cd ${LFS_TMP}/${1}-build &&
 ../${1}/configure \
-    --prefix=${GNOME2_PREFIX} \
-    --libexecdir=${GNOME2_PREFIX}/sbin \
-    --infodir=${GNOME2_PREFIX}/share/info \
+    --prefix=/usr \
+    --libexecdir=/usr/sbin \
+    --infodir=/usr/share/info \
     --localstatedir=/var/lib \
     --sysconfdir=/etc/gnome/${GNOME2_VER} &&
 make &&

diff --git a/stage6/pkg/gnome-audio b/stage6/pkg/gnome-audio
index ff667e3399f4a68e240cbb44be74f16c75683a6a..a1db19ffe1fe2bbd76ce41281283e2afcb360ff1 100644 (file)
--- a/stage6/pkg/gnome-audio
+++ b/stage6/pkg/gnome-audio
@@ -10,7 +10,7 @@ source ../packages-list
 apply_patches ${1} &&
 
 cd ${LFS_TMP}/${1} &&
-make prefix=${GNOME2_PREFIX} install
+make prefix=/usr install
 
 # Return last error
 exit $?

diff --git a/stage6/pkg/nautilus b/stage6/pkg/nautilus
index 59c3c34dde18987eba0ffefb1cfa205fc322d027..953da1cc6d4927378023d8eec3a78753a3716753 100644 (file)
--- a/stage6/pkg/nautilus
+++ b/stage6/pkg/nautilus
@@ -11,16 +11,16 @@ apply_patches ${1} &&
 
 cd ${LFS_TMP}/${1}-build &&
 ../${1}/configure \
-    --prefix=${GNOME2_PREFIX} \
-    --libexecdir=${GNOME2_PREFIX}/sbin \
+    --prefix=/usr \
+    --libexecdir=/usr/sbin \
     --localstatedir=/var/lib \
-    --infodir=${GNOME2_PREFIX}/share/info \
+    --infodir=/usr/share/info \
     --sysconfdir=/etc/gnome/${GNOME2_VER} &&
 make &&
 make install &&
-install -v -m755 -d ${GNOME2_PREFIX}/share/doc/${NAUTILUS} &&
+install -v -m755 -d /usr/share/doc/${NAUTILUS} &&
 install -v -m644 ${LFS_TMP}/${1}/docs/*.{txt,dia,pdf,sxw,faq,html} \
-    ${GNOME2_PREFIX}/share/doc/${NAUTILUS} &&
+    /usr/share/doc/${NAUTILUS} &&
 ldconfig
 
 # Return last error