From cf13160f4616398f6293d705177105b1c86a1a61 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 1 Jan 2012 19:49:22 +0000
Subject: For version 1.1 and up, install into /usr

---
 icedtea-web/build/icedtea-web.SlackBuild | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'icedtea-web/build')

diff --git a/icedtea-web/build/icedtea-web.SlackBuild b/icedtea-web/build/icedtea-web.SlackBuild
index 690a02dd..a2efa040 100755
--- a/icedtea-web/build/icedtea-web.SlackBuild
+++ b/icedtea-web/build/icedtea-web.SlackBuild
@@ -80,16 +80,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-JVMDIR=${JAVA_HOME:-"/usr/lib${LIBDIRSUFFIX}/java"}
-
+# IcedTea Web 1.1 and later do not install into the JDK/JRE directory but
+# straight into /usr/lib
 CFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure \
-  --prefix=$JVMDIR \
-  --mandir=$JVMDIR/man \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --with-jdk-home=$JVMDIR \
-  --with-jre-home=$JVMDIR/jre \
+  --with-jdk-home=/usr/lib${LIBDIRSUFFIX}/java \
+  --with-jre-home=/usr/lib${LIBDIRSUFFIX}/java/jre/ \
   --with-pkgversion=$(cat /etc/slackware-version |tr ' ' '-')-$ARCH \
   --disable-docs \
   --build=$TARGET
@@ -97,20 +99,10 @@ LDFLAGS="$SLKLDFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Provide symlinks to binaries to make them accessible:
-install -m755 -d $PKG/usr/bin
-install -m755 -d $PKG/$JVMDIR/jre/bin
-( cd $PKG/$JVMDIR/bin
-  for file in *; do
-    ln -sf ${JVMDIR}/bin/${file} ${PKG}/usr/bin
-    ln -sf ${JVMDIR}/bin/${file} ${PKG}/${JVMDIR}/jre/bin
-  done
-)
-
 # Provide a link to the plugin for browsers:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-  ln -sf $JVMDIR/lib/IcedTeaPlugin.so IcedTeaPlugin.so
+  ln -sf /usr/lib${LIBDIRSUFFIX}/IcedTeaPlugin.so
 )
 
 # Install desktop files:
@@ -124,7 +116,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
+  AUTHORS COPYING ChangeLog NEWS README doc/OVERVIEW \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3-65-gdbad