summaryrefslogtreecommitdiff
path: root/source/l/libmtp/libmtp.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/libmtp/libmtp.SlackBuild')
-rwxr-xr-xsource/l/libmtp/libmtp.SlackBuild19
1 files changed, 7 insertions, 12 deletions
diff --git a/source/l/libmtp/libmtp.SlackBuild b/source/l/libmtp/libmtp.SlackBuild
index 4783b676..6bf90b46 100755
--- a/source/l/libmtp/libmtp.SlackBuild
+++ b/source/l/libmtp/libmtp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM}
rm -rf $PKG
mkdir -p $TMP $PKG
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -77,6 +77,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAM}-$VERSION \
+ --with-udev=/lib/udev \
--disable-static \
--build=$ARCH-slackware-linux
@@ -84,14 +85,6 @@ CFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-# Commented out, since the rules are added by the Makefile, and since
-# there's no longer any match for MODE=
-#
-## Add udev rules:
-#mkdir -p $PKG/lib/udev/rules.d
-#sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \
-# > $PKG/lib/udev/rules.d/90-libmtp.rules
-
# Guess someone didn't have enough to drink:
( cd $PKG/usr/bin
rm -f mtp-sendtr mtp-sendfile mtp-newfolder mtp-getfile mtp-delfile
@@ -133,6 +126,8 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
AUTHORS COPYING ChangeLog INSTALL README* TODO \
$PKG/usr/doc/${PKGNAM}-$VERSION
+rm -rf $PKG/usr/share/doc
+rmdir $PKG/usr/share 2> /dev/null
# If there's a ChangeLog, installing at least part of the recent history
# is useful, but don't let it get totally out of control: