diff options
author | Eric Hameleers <alien@slackware.com> | 2014-04-09 10:42:45 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2014-04-09 10:42:45 +0000 |
commit | 26d4ede3d7349fb2d7afbdd3d2335c36d53fb12e (patch) | |
tree | 3ef181a1332c1e5819e1fd8d3faa1e2bfc5362f3 | |
parent | 95a353425b3e010b4e65df5eb6d8b47ee3f35f37 (diff) | |
download | asb-26d4ede3d7349fb2d7afbdd3d2335c36d53fb12e.tar.gz asb-26d4ede3d7349fb2d7afbdd3d2335c36d53fb12e.tar.xz |
Install gecko in the $WPREFIX instead of in /usr
The WoW64 build was broken because of the explicit libdir
-rwxr-xr-x | wine-pipelight/build/wine-pipelight.SlackBuild | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/wine-pipelight/build/wine-pipelight.SlackBuild b/wine-pipelight/build/wine-pipelight.SlackBuild index 8a357bb0..17a280f5 100755 --- a/wine-pipelight/build/wine-pipelight.SlackBuild +++ b/wine-pipelight/build/wine-pipelight.SlackBuild @@ -58,6 +58,10 @@ VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} +# We are going to isolate wine-piplelight from the rest of the system +# so that it does not clash with a regular wine installation: +WPREFIX="/usr/libexec/${PRGNAM}" + # If you do not want wine64 on Slackware64, set this to "no": DO_WINE64=${DO_WINE64:-"yes"} @@ -232,10 +236,6 @@ else do_opengl="out" fi -# We are going to isolate wine-piplelight from the rest of the system -# so that it does not clash with a regular wine installation: -WPREFIX="/usr/libexec/${PRGNAM}" - export CCAS="as" export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -248,8 +248,6 @@ function wineconfigure () { ../configure \ --prefix=${WPREFIX} \ - --bindir=${WPREFIX}/bin \ - --libdir=${WPREFIX}/lib \ --localstatedir=${WPREFIX}/var \ --sysconfdir=${WPREFIX}/etc \ --mandir=${WPREFIX}/man \ @@ -292,10 +290,10 @@ else fi # Add the wine-gecko MSI installer(s) to the Wine package: -mkdir -p $PKG/usr/share/wine/gecko -install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/ +mkdir -p $PKG/${WPREFIX}/share/wine/gecko +install -m0644 ${SOURCE[2]} $PKG/${WPREFIX}/share/wine/gecko/ if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then - install -m0644 ${SOURCE[3]} $PKG/usr/share/wine/gecko/ + install -m0644 ${SOURCE[3]} $PKG/${WPREFIX}/share/wine/gecko/ fi # Add some documentation to the package: |