diff options
| author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-10-19 01:31:12 +0000 |
|---|---|---|
| committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-10-19 01:31:12 +0000 |
| commit | 259401bf038604003bbf8168d2a5c8bc99dee4af (patch) | |
| tree | 19d613b499820e2f428c8efa11d8610d55001393 /grub | |
| parent | 5c5fc636fe5b6c1d02006148d75741d1ef2c4918 (diff) | |
| download | slackbuilds-259401bf038604003bbf8168d2a5c8bc99dee4af.tar.gz slackbuilds-259401bf038604003bbf8168d2a5c8bc99dee4af.tar.bz2 | |
updated some scripts
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@440 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'grub')
| -rwxr-xr-x | grub/grub.SlackBuild | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/grub/grub.SlackBuild b/grub/grub.SlackBuild index edf0311e..0c68ee90 100755 --- a/grub/grub.SlackBuild +++ b/grub/grub.SlackBuild @@ -4,6 +4,18 @@ # by rhatto at riseup.net # +if [ -s "slack-required" ]; then + echo Recomended and required packages for building cairo are: + cat slack-required | sed -e 's/^/\t/' + if [ "$INTERACT" != "no" ]; then + echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER. + read crap + else + echo Sleeping 3 seconds... + sleep 3 + fi +fi + CWD="`pwd`" if [ -f "/etc/slackbuildrc" ]; then @@ -30,6 +42,7 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40 if [ "$ARCH" == "x86_64" ]; then + export LDFLAGS="-L/lib64 -L/usr/lib64" LIBDIR=/usr/lib64 else LIBDIR=/usr/lib @@ -40,12 +53,6 @@ PACKAGE_EXT="gz" SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" URL="ftp://alpha.gnu.org/gnu/grub/$SRC" -if [ "$PACKAGE_EXT" == "bz2" ]; then - tarflag="j" -else - tarflag="z" -fi - SRC_DIR="$SRC_DIR/$PACKAGE" mkdir -p $SRC_DIR @@ -58,7 +65,7 @@ rm -rf $TMP mkdir -p $TMP cd $TMP -tar xvf$tarflag $SRC_DIR/$SRC +tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR cd $PACKAGE-$VERSION ./configure --prefix=/usr --libdir=$LIBDIR || exit $ERROR_CONF |