From 105edff4cec0227c1a022cc20d1fa16435f6544d Mon Sep 17 00:00:00 2001
From: Tomasz Konojacki <me@xenu.tk>
Date: Thu, 17 Apr 2014 08:23:48 +0700
Subject: desktop/fvwm95: Fix build on x86_64.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/fvwm95/fvwm95.SlackBuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'desktop/fvwm95/fvwm95.SlackBuild')

diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild
index 78ce3ee144..682021a832 100644
--- a/desktop/fvwm95/fvwm95.SlackBuild
+++ b/desktop/fvwm95/fvwm95.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=fvwm95
 VERSION=${VERSION:-2.0.43f}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,13 +72,6 @@ find -L . \
 # Apply patch to make compilation possible
 patch -p1 < $CWD/fvwm95.patch
 
-# Fix path on x86_64
-subdirs="libs fvwm modules utils sample.fvwmrc xpmroot pixmaps mini-icons docs"
-for S in ${subdirs}; do
-  sed -i "s|/lib/X11|/lib${LIBDIRSUFFIX}/X11|" $S/Makefile.in
-done
-sed -i "s|lib_dir=@exec_prefix@/lib|lib_dir=@exec_prefix@/lib${LIBDIRSUFFIX}|" libs/Makefile.in
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -100,6 +93,11 @@ install -m 755 $CWD/xinitrc.fvwm95 $PKG/etc/X11/xinit
 mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot95
 mv $PKG/usr/man/man1/xpmroot.1 $PKG/usr/man/man1/xpmroot95.1
 
+# rename manpages
+for m in $PKG/usr/man/man1/Fvwm* ; do
+  mv $m `echo $m | sed -r 's/Fvwm/Fvwm95/'`
+done
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-- 
cgit v1.2.3-80-g2a13