1 files changed, 16 insertions, 8 deletions
diff --git a/development/scite/scite.SlackBuild b/development/scite/scite.SlackBuild
index 423c7b7c0d..71777c6cd5 100644
--- a/development/scite/scite.SlackBuild
+++ b/development/scite/scite.SlackBuild
@@ -1,10 +1,11 @@
 #!/bin/sh
 # Slackware build script for SciTE
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Some modifications for v2.27 by Jens Weber <jens@tuxane.com>
+# v2.27: Some modifications by Jens Weber <jens@tuxane.com>
+# v3.02: (jw) Some more changes, see README.Slackware and changelog
 
 PRGNAM=scite
-VERSION=2.27
+VERSION=3.02
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -20,6 +21,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+HELPBROWSER=mozilla
 
 
 if [ "$ARCH" = "i486" ]; then
@@ -47,13 +49,15 @@ chown -R root:root scite/ scintilla/
 chmod -R u+w,go+r-w,a-s scite/ scintilla/
 
 cd $TMP/scintilla
-sed -i "s%-Os%$SLKCFLAGS%g" gtk/makefile
+sed -i "s/^\(CXXFLAGS\)/\1+/g" gtk/makefile
+CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 
 cd $TMP/scite
-sed -i "s%-Os%$SLKCFLAGS%g" gtk/makefile
-sed -i "s%-Os%$SLKCFLAGS%g" src/Embedded.properties
-sed -i "s%-Os%$SLKCFLAGS%g" src/cpp.properties
+sed -i "s%xdg-open%$HELPBROWSER%g" src/Embedded.properties
+sed -i "s%xdg-open%$HELPBROWSER%g" src/SciTEGlobal.properties
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 make -C gtk install DESTDIR=$PKG
 
@@ -63,13 +67,17 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 ( cd $PKG/usr/bin ; ln -sf SciTE scite )
 
 mkdir -p $PKG/usr/share/scite
-cat $CWD/config/SciTEGlobal.properties >> $PKG/usr/share/scite/SciTEGlobal.properties
-
 mkdir -p $PKG/usr/man/man1
 cat doc/scite.1 | gzip -9c > $PKG/usr/man/man1/scite.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a README License.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/config/SciTEGlobal.properties.new >> $PKG/usr/doc/$PRGNAM-$VERSION/SciTEGlobal.properties.new
+cat $CWD/config/SciTEUser.properties.new >> $PKG/usr/doc/$PRGNAM-$VERSION/SciTEUser.properties.new
+cat $CWD/config/changelog >> $PKG/usr/doc/$PRGNAM-$VERSION/changelog
+cat $CWD/config/README.Slackware >> $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+
+
 for i in $PKG/usr/share/scite/*.html $PKG/usr/share/scite/*.png ; do 
   ln -s /usr/share/scite/$(basename $i) \
         $PKG/usr/doc/$PRGNAM-$VERSION/html/$(basename $i) ;