Properly use the two source directories

1 files changed, 44 insertions, 38 deletions

diff --git a/recordmydesktop/build/recordmydesktop.SlackBuild b/recordmydesktop/build/recordmydesktop.SlackBuild
index 5b75f180..91c070e4 100755
--- a/recordmydesktop/build/recordmydesktop.SlackBuild
+++ b/recordmydesktop/build/recordmydesktop.SlackBuild
@@ -147,45 +147,47 @@ echo Building ...
 
 # First, the commandline program:
 cd ${PRGNAM}-${VERSION}
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --program-prefix= \
-            --program-suffix= \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+  LDFLAGS="$SLKLDFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  CFLAGS="$SLKCFLAGS" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --sysconfdir=/etc \
+    --program-prefix= \
+    --program-suffix= \
+    --build=$ARCH-slackware-linux \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+
+  if $(which installwatch > /dev/null 2>&1); then
+    installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
+  else
+    make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  fi
+cd ..
 
 # Next, the QT4 GUI program:
 cd qt-${PRGNAM}-${QTVER}
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --program-prefix= \
-            --program-suffix= \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-qt-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-qt-${PRGNAM}.log
-
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+  LDFLAGS="$SLKLDFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  CFLAGS="$SLKCFLAGS" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --sysconfdir=/etc \
+    --program-prefix= \
+    --program-suffix= \
+    --build=$ARCH-slackware-linux \
+    2>&1 | tee $OUTPUT/configure-qt-${PRGNAM}.log
+  make 2>&1 | tee $OUTPUT/make-qt-${PRGNAM}.log
+
+  if $(which installwatch > /dev/null 2>&1); then
+    installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
+  else
+    make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  fi
+cd ..
 
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
@@ -199,8 +201,12 @@ EOT
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/qt-${PROGRAM}
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $QTDOCS $PKG/usr/doc/$PRGNAM-$VERSION/qt-${PROGRAM} || true
+( cd ${PRGNAM}-${VERSION}
+  cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+)
+( cd qt-${PRGNAM}-${QTVER}
+  cp -a $QTDOCS $PKG/usr/doc/$PRGNAM-$VERSION/qt-${PROGRAM} || true
+)
 cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;