--- a/lib/ncurses/ncurses.sh	Sun Mar 10 14:54:37 2019 +0100
+++ b/lib/ncurses/ncurses.sh	Sun Mar 10 15:17:06 2019 +0100
@@ -15,35 +15,46 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+
 source ./ncurses.info
 
-case $(uname -m) in
-x86_64)
-	CFLAGS="-O2 -fPIC"
-	;;
-*)
-	CFLAGS="-O2"
-	;;
-esac
-
-set -e
+set -ex
 
 rm -rf $PKGNAME-$PKGVERSION
 tar xvaf $PKGNAME-$PKGVERSION.tar.gz
 pushd $PKGNAME-$PKGVERSION
 
-CFLAGS="$CFLAGS" ./configure \
+# wide version
+mkdir wide-build && pushd wide-build
+CC="$CC" CFLAGS="$CFLAGS" ../configure \
 	--enable-pc-files \
 	--enable-widec \
 	--prefix=/usr \
-	--with-cxx-binding \
-	--with-cxx-shared \
+	--without-ada \
 	--with-pkg-config-libdir=/usr/lib/pkgconfig \
 	--with-shared \
 	--without-debug
 make
 make install DESTDIR=$DESTDIR
-rm -f $DESTDIR/usr/lib/lib{menuw,ncursesw,panelw,formw,ncurses++w}.a
+rm -f $DESTDIR/usr/lib/lib{menuw,ncursesw,panelw,formw}.a
+popd
+
+# normal version
+mkdir normal-build && pushd normal-build
+CC="$CC" CFLAGS="$CFLAGS" ../configure \
+	--enable-pc-files \
+	--prefix=/usr \
+	--without-ada \
+	--with-pkg-config-libdir=/usr/lib/pkgconfig \
+	--with-shared \
+	--without-debug
+make
+make install DESTDIR=$DESTDIR
+rm -f $DESTDIR/usr/lib/lib{menu,ncurses,panel,form}.a
+ln -sf libncurses.so $DESTDIR/usr/lib/libcurses.so
+popd
 
 popd
 rm -rf $PKGNAME-$PKGVERSION