Removed double documentation

1 files changed, 14 insertions, 25 deletions

diff --git a/xvidcap/build/xvidcap.SlackBuild b/xvidcap/build/xvidcap.SlackBuild
index f7de75aa..8c2c6bf8 100755
--- a/xvidcap/build/xvidcap.SlackBuild
+++ b/xvidcap/build/xvidcap.SlackBuild
@@ -29,11 +29,14 @@
 # Descr:     screen capture program
 # URL:       http://xvidcap.sourceforge.net/
 # Needs:     (for building only:) scrollkeeper
+# Optional:  lame (for mp3 audio recording)
 # Changelog:
 # 1.1.6-1:   03/Jun/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
 # 1.1.6-2:   04/Jun/2007 by Eric Hameleers <alien@slackware.com>
 #            * Fixed the icon display in the .desktop file.
+# 1.1.6-3:   18/aug/2007 by Eric Hameleers <alien@slackware.com>
+#            * Removed double documentation from the package.
 # 
 # Run 'sh xvidcap.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -46,7 +49,7 @@
 PRGNAM=xvidcap
 VERSION=${VERSION:-1.1.6}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO.tasks"
 
@@ -60,7 +63,6 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://dl.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
@@ -104,24 +106,11 @@ case "$ARCH" in
 esac
 
 # Create working directories:
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -161,20 +150,21 @@ if `file ${SOURCE} | grep -q ": bzip2"`; then
 elif `file ${SOURCE} | grep -q ": gzip"`; then
   tar -xzvf ${SOURCE}
 fi
-chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
- 
 cd ${PRGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
             --datarootdir=/usr \
             --datadir=/usr/share \
+            --docdir=/usr/doc/${PRGNAM}-${VERSION} \
 	    --enable-libmp3lame \
 	    --enable-libtheora \
             --program-prefix="" \
@@ -183,9 +173,7 @@ CFLAGS="$SLKCFLAGS" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-#
 # Install all the needed stuff to the package dir
-#
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
 if `which installwatch  > /dev/null 2>&1`; then
@@ -208,6 +196,7 @@ sed -i -e "s#^Icon=${PRGNAM}.png#Icon=/usr/share/pixmaps/${PRGNAM}.png#" \
   $PKG/usr/share/applications/${PRGNAM}.desktop
 
 # Add documentation:
+rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*