diff options
| author | Robby Workman <rw@rlworkman.net> | 2010-05-13 00:40:25 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:40:25 +0200 |
| commit | 7428a17545fdefd555518531aab08a5116ebe0ad (patch) | |
| tree | 5ff27900af40dbd3c27ba425a3504d45dc936e90 /system/gdm/gdm.SlackBuild | |
| parent | efd1b68a8e469f3a197840542df892d8f9584dc5 (diff) | |
system/gdm: Updated for version 2.20.10
Diffstat (limited to 'system/gdm/gdm.SlackBuild')
| -rw-r--r-- | system/gdm/gdm.SlackBuild | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild index d5a46fb09c702..aa18408377fdc 100644 --- a/system/gdm/gdm.SlackBuild +++ b/system/gdm/gdm.SlackBuild @@ -9,7 +9,7 @@ # Modified by Frank Caraballo <fecaraballo{at}gmail{dot}com> PRGNAM=gdm -VERSION=${VERSION:-2.20.9} +VERSION=${VERSION:-2.20.10} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -21,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -46,6 +49,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc/X11 \ --localstatedir=/var/lib \ --mandir=/usr/man \ @@ -57,8 +61,19 @@ CXXFLAGS="$SLKCFLAGS" \ --with-dmconfdir=/etc/X11/$PRGNAM \ --build=$ARCH-slackware-linux -make -make install-strip DESTDIR=$PKG +make SUSPEND_COMMAND=/usr/sbin/pm-suspend +make SUSPEND_COMMAND=/usr/sbin/pm-suspend install-strip DESTDIR=$PKG + +# Install some simple session files designed to work with Slackware +mkdir -p $PKG/etc/X11/$PRGNAM/Sessions +cp -r $CWD/Sessions/* $PKG/etc/X11/$PRGNAM/Sessions +chmod 0755 $PKG/etc/X11/$PRGNAM/Sessions/* + +# Make xfce the default session +patch -d $PKG -p1 < $CWD/make_xfce_default_session.diff + +# Let's not clobber the a custom config +mv $PKG/etc/X11/gdm/custom.conf $PKG/etc/X11/gdm/custom.conf.new ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; @@ -66,17 +81,14 @@ make install-strip DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* TODO docs/C/* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* TODO docs/C/* \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Simple session files designed to work with Slackware: -mkdir -p $PKG/etc/X11/$PRGNAM/Sessions -cp -r $CWD/Sessions/* $PKG/etc/X11/$PRGNAM/Sessions -chmod 0755 $PKG/etc/X11/$PRGNAM/Sessions/* - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |