From 932b788044853a1ad1775e222977ec05d7df7feb Mon Sep 17 00:00:00 2001 From: dsomero Date: Sun, 30 Sep 2012 00:55:43 -0400 Subject: [PATCH] system/prelink: Fixed (Use relative path in doinst.sh) Signed-off-by: dsomero --- system/prelink/doinst.sh | 2 +- system/prelink/prelink.SlackBuild | 44 +++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/system/prelink/doinst.sh b/system/prelink/doinst.sh index 89a59bac84..ad00816736 100644 --- a/system/prelink/doinst.sh +++ b/system/prelink/doinst.sh @@ -11,4 +11,4 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config /etc/prelink.conf.new +config etc/prelink.conf.new diff --git a/system/prelink/prelink.SlackBuild b/system/prelink/prelink.SlackBuild index 97b71cc8ca..06d2473c33 100644 --- a/system/prelink/prelink.SlackBuild +++ b/system/prelink/prelink.SlackBuild @@ -24,15 +24,15 @@ PRGNAM=prelink VERSION=${VERSION:-20100106} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac fi CWD=$(pwd) @@ -41,17 +41,17 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -74,12 +74,12 @@ find . \ CFLAGS="$SLKFLAGS" \ CXXFLAGS="$SLKFLAGS" \ ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux make make -C doc @@ -93,8 +93,8 @@ cat $CWD/prelink.conf > $PKG/etc/prelink.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cp doc/prelink.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild