diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-12-22 16:51:11 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-12-22 16:51:11 +0000 |
| commit | d531fbf189b7ec99d3113ba6ab9e7144605690dd (patch) | |
| tree | e1acf8e26347dc36c6c1d49e0f27ab6f7311a39a /pipelight | |
| parent | 4e4598f4e7ed00b61f3f4888e625fa8f7525c13e (diff) | |
| download | asb-d531fbf189b7ec99d3113ba6ab9e7144605690dd.tar.gz asb-d531fbf189b7ec99d3113ba6ab9e7144605690dd.tar.xz | |
Final tune-ups - this version builds a correct package
Diffstat (limited to 'pipelight')
| -rwxr-xr-x | pipelight/build/pipelight.SlackBuild | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pipelight/build/pipelight.SlackBuild b/pipelight/build/pipelight.SlackBuild index 16e74b2f..f4b5269d 100755 --- a/pipelight/build/pipelight.SlackBuild +++ b/pipelight/build/pipelight.SlackBuild @@ -90,11 +90,14 @@ OUTPUT=${OUTPUT:-/tmp} SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" SRCURL[0]="https://bitbucket.org/mmueller2012/${PRGNAM}/get/v${VERSION}.tar.gz" -SOURCE[1]="$SRCDIR/pluginloader-prebuilt-${VERSION}.tar.gz" +SOURCE[1]="$SRCDIR/pluginloader-v${VERSION}.tar.gz" SRCURL[1]="http://repos.fds-team.de/pluginloader/v${VERSION}/pluginloader.tar.gz" -SOURCE[2]="$SRCDIR/LICENSE.pluginloader-prebuilt" -SRCURL[2]="https://bitbucket.org/mmueller2012/pipelight/raw/v${VERSION}/debian/copyright" +SOURCE[2]="$SRCDIR/pluginloader-v${VERSION}.tar.gz.sig" +SRCURL[2]="http://repos.fds-team.de/pluginloader/v${VERSION}/pluginloader.tar.gz.sig" + +SOURCE[3]="$SRCDIR/LICENSE.pluginloader-prebuilt" +SRCURL[3]="https://bitbucket.org/mmueller2012/pipelight/raw/v${VERSION}/debian/copyright" if [ "$UPDATE_SCRIPT" != "NO" ]; then rm -f $SRCDIR/install-dependency-HEAD @@ -201,7 +204,8 @@ cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE[0]} mv mmueller2012-pipelight-* ${PRGNAM}-${VERSION} -tar -xvf ${SOURCE[1]} -C ${PRGNAM}-${VERSION} +# The "make install" will verify and unpack the binaries: +cp ${SOURCE[1]} ${SOURCE[2]} ${PRGNAM}-${VERSION}/ cd ${PRGNAM}-${VERSION} @@ -215,7 +219,6 @@ fi # Slackware specific patches: # No patches needed. #touch $OUTPUT/patch-${PRGNAM}.log -sed -i -e 's,share/man,man,g' Makefile chown -R root:root . chmod -R u+w,go+r-w,a+X-s . @@ -226,27 +229,20 @@ export CXXFLAGS="$SLKCFLAGS" export CFLAGS="$SLKCFLAGS" ./configure \ --prefix=/usr \ - --wine-path=$WPREFIX/bin/wine \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ --moz-plugin-path=/usr/lib${LIBDIRSUFFIX}/mozilla/plugins \ + --wine-path=$WPREFIX/bin/wine \ --gcc-runtime-dlls="" \ --show-installation-dialogs \ ${ARCH_OPTS} \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log -make SUBDIRS=src/linux $NUMJOBS \ +make $NUMJOBS \ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -make SUBDIRS=src/linux DESTDIR=$PKG install \ +make DESTDIR=$PKG install \ 2>&1 | tee $OUTPUT/install-${PRGNAM}.log -# Install the pre-built windows binaries: -mkdir -p $PKG/usr/share/pipelight -install -m0755 src/windows/pluginloader.exe $PKG/usr/share/pipelight -install -m0755 src/winecheck/winecheck.exe $PKG/usr/share/pipelight -if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then - install -m0755 src/windows/pluginloader64.exe $PKG/usr/share/pipelight - install -m0755 src/winecheck/winecheck64.exe $PKG/usr/share/pipelight -fi - # Create the doinst.sh script: mkdir -p $PKG/install cat <<EOT > $PKG/install/doinst.sh |