From 9c23f087819d8e17cd248a3e2543d59b4c32d26d Mon Sep 17 00:00:00 2001 From: gobo72 Date: Thu, 18 Aug 2011 02:47:57 +0000 Subject: [PATCH] =?utf8?q?Enlev=C3=A9=20variable=20GNOME2=5FPREFIX,=20car?= =?utf8?q?=20on=20installe=20gnome=20dans=20/usr?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/packages-list | 1 - config/sysinfos.amd64 | 2 +- stage5/hv-install-1 | 3 +++ stage5/pkg/gnome | 8 ++++---- stage5/pkg/gnome-nobuild | 6 +++--- stage6/pkg/gal | 6 +++--- stage6/pkg/gdm | 6 +++--- stage6/pkg/gnome-applets | 6 +++--- stage6/pkg/gnome-audio | 2 +- stage6/pkg/nautilus | 10 +++++----- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/config/packages-list b/config/packages-list index 61f380e..0473354 100644 --- 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 5b9a621..2ba0774 100644 --- 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 8e4f869..0a3a94d 100755 --- 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 a5c103e..b45fe94 100644 --- 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 9a9d293..b45fe94 100644 --- 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 83b0f5a..9b84b19 100644 --- 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 804dba8..087c241 100644 --- 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 f473faf..50b7913 100644 --- 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 ff667e3..a1db19f 100644 --- 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 59c3c34..953da1c 100644 --- 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 -- 2.20.1