1 files changed, 11 insertions, 9 deletions
diff --git a/development/cc65/cc65.SlackBuild b/development/cc65/cc65.SlackBuild
index 43e5d6955c..4878b29fb5 100644
--- a/development/cc65/cc65.SlackBuild
+++ b/development/cc65/cc65.SlackBuild
@@ -6,6 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170703 bkw:
+# - Update for 2.16_20170630. Upstream still hasn't done a release, but
+#   again there's lots of development.
+# - My self-hosted source tarball now includes the HTML documentation. This
+#   script used to build it, but -current's linuxdoc-tools chokes on it,
+#   and fixing it would require me a week or two probably. So, for now
+#   anyway, the tarball includes docs that were built on 14.2.
+
 # 20170129 bkw:
 # - Update for v2.15_20170126, aka git 6878ede. Upstream hasn't done
 #   a release since 2013 or so, but there's been lots of development.
@@ -14,7 +22,7 @@
 #   reason. Source is created from a git checkout, see git2targz.sh.
 
 PRGNAM=cc65
-VERSION=${VERSION:-2.15_20170126}
+VERSION=${VERSION:-2.16_20170630}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,17 +62,11 @@ find . -type f -print0 | xargs -0 chmod 644
 find . -type d -print0 | xargs -0 chmod 755
 
 # external CFLAGS not honored
-sed -i "/^CFLAGS/s,-O,$SLKCFLAGS," src/Makefile
-
-# If we wanted GNU info docs, we could 'make doc' instead of 'make -C doc
-# html'. But, they're the same as the HTML pages, and they install into
-# /usr/info with names like 'intro' and 'index', which would be confusing.
-# It would be possible to patch things so we had 'cc65-intro', etc,
-# but IMO not worth the effort.
+sed -i "/^CFLAGS/s,-O[^ ]*,$SLKCFLAGS," src/Makefile
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 make all prefix=/usr LDFLAGS=-Wl,-s
-make -C doc html
+#make -C doc html # we use pre-generated HTML docs now
 make install prefix=$PKG/usr htmldir=$PKGDOC samplesdir=$PKGDOC/samples
 
 # binaries already stripped, no man pages