summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-04-19 17:01:47 +0200
committersibel <lesibel@free.fr>2011-04-19 17:01:47 +0200
commitc1972643d97864c26c6565b82da918ddbb72dac2 (patch)
tree659bcf05de62fd78da14d4e3f380fb3cd3a37ac1
parent3e4e78fb06aaff50f7cb27b6ac87f0bcb0747226 (diff)
parent5ff017f38f8a26bd6d307831ef72119b506fab10 (diff)
downloadnutyx-pakxe-c1972643d97864c26c6565b82da918ddbb72dac2.tar.gz
nutyx-pakxe-c1972643d97864c26c6565b82da918ddbb72dac2.tar.bz2
nutyx-pakxe-c1972643d97864c26c6565b82da918ddbb72dac2.tar.xz
nutyx-pakxe-c1972643d97864c26c6565b82da918ddbb72dac2.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r--base/aaabasicfs/.md5sum.i6862
-rw-r--r--base/aaabasicfs/.md5sum.x86_642
-rw-r--r--base/aaabasicfs/Pkgfile6
-rw-r--r--base/aaabasicfs/X.sh6
4 files changed, 9 insertions, 7 deletions
diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index 085119a56..2ca3d4683 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -1,4 +1,4 @@
-5b74148cdacc6b0b3e814fd5d5a8c05c X.sh
+b9bdd0860e6e4810f5b5e094e4d50aa4 X.sh
61ba4859757a54bf1f514de5213802e0 bash_profile
f29eb765bd7c24471d055cc72b0edd4e bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index 085119a56..2ca3d4683 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -1,4 +1,4 @@
-5b74148cdacc6b0b3e814fd5d5a8c05c X.sh
+b9bdd0860e6e4810f5b5e094e4d50aa4 X.sh
61ba4859757a54bf1f514de5213802e0 bash_profile
f29eb765bd7c24471d055cc72b0edd4e bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index ea83b41e7..4ca814f5f 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -4,7 +4,7 @@
# Packager: thierryn1 at hispeed dot ch
name=aaabasicfs
-version=20110326
+version=20110419
release=1
scriptsversion=lfs-bootscripts-20100627
BLFSscriptsversion=20100825
@@ -42,6 +42,10 @@ build() {
for dir in $PKG/usr $PKG/usr/local; do
ln -sv share/{man,doc,info} $dir
done
+ case $(uname -m) in
+ x86_64) ln -sv lib $PKG/lib64 && ln -sv lib $PKG/usr/lib64 ;;
+ esac
+
mkdir -v $PKG/var/{lock,log,mail,run,spool}
mkdir -pv $PKG/var/{opt,cache,lib/{misc,locate},local}
touch $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log,wtmp,btmp}
diff --git a/base/aaabasicfs/X.sh b/base/aaabasicfs/X.sh
index 222ebaba4..a6360fdd1 100644
--- a/base/aaabasicfs/X.sh
+++ b/base/aaabasicfs/X.sh
@@ -1,13 +1,11 @@
-export GNOME_LIBCONFIG_PATH=/usr/lib
export LIBGLADE_MODULE_PATH=/usr/lib/libglade/2.0
-export QTDIR=/opt/qt
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
+export QT4DIR=/usr
export INFOPATH=/usr/share/info
export PYTHONPATH=/usr/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages/GMenuSimpleEditor
if [ -x /usr/X11R6/bin/X ]; then
pathappend /usr/X11R6/bin
XDG_DATA_DIRS=/usr/share:/usr/share/akonadi/agents:/usr/local/share
- XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/xdg
+ XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
export XDG_DATA_DIRS XDG_CONFIG_DIRS
fi