grub update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@65 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/gd/gd.SlackBuild b/gd/gd.SlackBuild
index 09a6b03d2b4e52341c7444e13e1a855d9e6338ab..9ec0005e0015d24a64eee69cb64c7101d5e30993 100755 (executable)
--- a/gd/gd.SlackBuild
+++ b/gd/gd.SlackBuild
@@ -58,11 +58,11 @@ cd $PACKAGE-$VERSION
 # building with --disable-shared, otherwise stuff such as mrtg wont compile
 ./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-fontconfig=no --disable-shared
 make
-make DESTDIR=$TMP/package-$PACKAGE/$PACKAGE install
+make DESTDIR=$TMP/package-$PACKAGE install
 
 CWD="`pwd`"
 
-cd $TMP/package-$PACKAGE/$PACKAGE
+cd $TMP/package-$PACKAGE
 
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null

diff --git a/grub/grub.SlackBuild b/grub/grub.SlackBuild
index 75e693e22e75f1408ef51ce732dd72b3f5fd94b6..da275b23e77144ee401d45594507d9a2471d2f68 100755 (executable)
--- a/grub/grub.SlackBuild
+++ b/grub/grub.SlackBuild
@@ -20,6 +20,7 @@ VERSION=${VERSION:=0.96}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
+REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
@@ -38,25 +39,28 @@ else
   tarflag="z"
 fi
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+mkdir -p $SRC_DIR
+
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   wget "$URL" -O "$SRC_DIR/$SRC"
 fi
 
+TMP="$TMP/$PACKAGE"
+rm -rf $TMP
+mkdir -p $TMP
 cd $TMP
-rm -rf package-$PACKAGE
-mkdir package-$PACKAGE
-cd package-$PACKAGE
 
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $PACKAGE-$VERSION
 
 ./configure --prefix=/usr --libdir=$LIBDIR
 make
-make DESTDIR=$TMP/package-$PACKAGE/$PACKAGE install
+make DESTDIR=$TMP/package-$PACKAGE install
 
 CWD="`pwd`"
 
-cd $TMP/package-$PACKAGE/$PACKAGE
+cd $TMP/package-$PACKAGE
 
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -91,5 +95,9 @@ for file in AUTHORS BUGS COPYING ChangeLog INSTALL MAINTENANCE NEWS README THANK
   cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
 done
 
-makepkg -c y -l y $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf $TMP
+fi