1 files changed, 29 insertions, 9 deletions
diff --git a/freenx/build/nx.SlackBuild b/freenx/build/nx.SlackBuild
index 9e25bc99..4c4741d2 100755
--- a/freenx/build/nx.SlackBuild
+++ b/freenx/build/nx.SlackBuild
@@ -63,9 +63,6 @@ ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
-DOCS="ABOUT* AUTHORS BUGS ChangeLog* COPYING CREDITS FAQ GPL* HACKING \
-      LICENSE MAINTAINERS NEWS README* TODO"
-
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -206,7 +203,7 @@ cat >> nx-X11/config/cf/host.def << EOF
 #endif
 EOF
 
-sed -i -e "s|CXXFLAGS=.-O.*|CXXFLAGS=$CXXFLAGS|" */configure
+sed -i -e "s|CXXFLAGS=.-O.*|CXXFLAGS=\"$CXXFLAGS\"|" */configure
 
 # Build Compression Library and Proxy
 for i in nxcomp nxproxy nxcompshad; do
@@ -285,12 +282,35 @@ ln -snf nxagent $PKG/usr/bin/nxesd
 chmod 755 $PKG/usr/bin/nxesd
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p \
+  $PKG/usr/doc/$PRGNAM-$VERSION/{nx-X11,nxcomp,nxcompext,nxesd,nxproxy,nxssh}
+cd nx-X11
+cp -a BUILD CHANGELOG* COPYING ChangeLog.X.org LABEL LICENSE README* RELNOTES \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nx-X11
+cd -
+cd nxcomp
+cp -a COPYING LICENSE README* VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nxcomp
+cd -
+cd nxcompext
+cp -a CHANGELOG COPYING LICENSE README* VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nxcompext
+cd -
+cd nxesd
+cp -a AUTHORS CHANGELOG COPYING COPYRIGHT ChangeLog.ESD.original \
+  LICENSE MAINTAINERS NEWS README TIPS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nxesd
+cd -
+cd nxproxy
+cp -a CHANGELOG COPYING LICENSE README* VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nxproxy
+cd -
+cd nxssh
+cp -a CHANGELOG* CREDITS ChangeLog.SSH.orginal \
+  LICENCE OVERVIEW README* RFC.nroff TODO WARNING.RNG \
+  $PKG/usr/doc/$PRGNAM-$VERSION/nxssh
+cd -
 cp -r nxscripts $PKG/usr/doc/$PRGNAM-$VERSION 
-cp nxcomp/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cp nxcomp/README $PKG/usr/doc/$PRGNAM-$VERSION/README.nxcomp
-cp nxdesktop/README $PKG/usr/doc/$PRGNAM-$VERSION/README.nxdesktop
-cp -a nxdesktop/doc $PKG/usr/doc/$PRGNAM-$VERSION/nxdesktop
 cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;