diff --git a/e/emacs/emacs.SlackBuild b/e/emacs/emacs.SlackBuild index 1fec38a6..90a00f52 100755 --- a/e/emacs/emacs.SlackBuild +++ b/e/emacs/emacs.SlackBuild @@ -119,48 +119,48 @@ EOF chmod +x $PKG/usr/bin/emacs ) -# # Also add a version of the binary that is not linked to X11: -# cd $TMP -# rm -rf $PRGNAM-$VERSION -# if [ ! -e $CWD/$PRGNAM-$VERSION.tar.?z* ] ; then -# # FIXME: Hackish hack -# cp -R $REPOSITORIES/$PRGNAM/$BRANCH $TMP/$PRGNAM-$VERSION -# SRCDIR=$REPOSITORIES/$PRGNAM/$BRANCH -# else -# tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -# SRCDIR=. -# fi +# Also add a version of the binary that is not linked to X11: +cd $TMP +rm -rf $PRGNAM-$VERSION +if [ ! -e $CWD/$PRGNAM-$VERSION.tar.?z* ] ; then + # FIXME: Hackish hack + cp -R $REPOSITORIES/$PRGNAM/$BRANCH $TMP/$PRGNAM-$VERSION + SRCDIR=$REPOSITORIES/$PRGNAM/$BRANCH +else + tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 + SRCDIR=. +fi -# cd $PRGNAM-$VERSION || exit 1 -# chown -R root:root . -# find . \ -# \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -# -exec chmod 755 {} \; -o \ -# \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -# -exec chmod 644 {} \; +cd $PRGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -# CFLAGS="$SLKCFLAGS" \ -# CXXFLAGS="$SLKCFLAGS" \ -# $SRCDIR/configure \ -# --prefix=/usr \ -# --sysconfdir=/etc \ -# --localstatedir=/var \ -# --program-prefix="" \ -# --program-suffix="" \ -# --mandir=/usr/man \ -# --infodir=/usr/info \ -# --enable-static=no \ -# --enable-shared=yes \ -# --with-x=no \ -# --without-gconf \ -# --build=${ARCH}-slackware-linux +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +$SRCDIR/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --program-prefix="" \ + --program-suffix="" \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --enable-static=no \ + --enable-shared=yes \ + --with-x=no \ + --without-gconf \ + --build=${ARCH}-slackware-linux -# make $NUMJOBS || make || exit 1 +make $NUMJOBS || make || exit 1 -# # Install the non-x version: -# cat src/emacs > $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 -# chown root:root $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 -# chmod 1755 $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 +# Install the non-x version: +cat src/emacs > $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 +chown root:root $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 +chmod 1755 $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11 # I don't care for broken permissions. chmod 755 $PKG/var/games/emacs