From 3ef033b8988a62fe8a8e4d5e31c2febc1e25ae8c Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 04 Aug 2014 09:04:36 -0400
Subject: build: Unify common configure options

This also adds "--with-termlib=tinfo" and "--with-ticlib=tic" to the
"build-ncursesw" target.
---
diff --git a/build b/build
index 80fa3bd..cd2a9d8 100755
--- a/build
+++ b/build
@@ -2,46 +2,36 @@
 
 include ../source.mk
 
+common_opts = \
+	--without-ada \
+	--without-tests \
+	--with-pkg-config-libdir='/usr/lib/$(OPK_HOST_ARCH)/pkgconfig' \
+	--enable-pc-files \
+	--with-install-prefix="$${PWD}/dest" \
+	--with-shared \
+	--without-debug \
+	--without-profile \
+	--with-termlib=tinfo \
+	--with-ticlib=tic \
+	--disable-termcap \
+	--enable-symlinks \
+	--enable-const
+
 nop:
 	@:
 
 build-ncurses:
 	oh-autoconfigure -B obj-ncurses -- \
-		--without-ada \
-		--without-tests \
-		--with-pkg-config-libdir='/usr/lib/$(OPK_HOST_ARCH)/pkgconfig' \
-		--enable-pc-files \
-		--with-install-prefix="$${PWD}/dest" \
-		--with-shared \
-		--without-debug \
-		--without-profile \
-		--with-termlib=tinfo \
-		--with-ticlib=tic \
-		--disable-termcap \
-		--enable-symlinks \
-		--enable-const
+		$(common_opts)
 	oh-autobuild -B obj-ncurses
 	touch $@
 
 build-ncursesw:
 	oh-autoconfigure -B obj-ncursesw -- \
+		$(common_opts) \
 		--includedir=/usr/include/ncursesw \
-		--without-ada \
-		--without-manpages \
 		--without-progs \
-		--without-tests \
-		--with-pkg-config-libdir='/usr/lib/$(OPK_HOST_ARCH)/pkgconfig' \
-		--enable-pc-files \
-		--with-install-prefix="$${PWD}/dest" \
-		--with-shared \
-		--without-debug \
-		--without-profile \
-		--without-termlib \
-		--without-ticlib \
-		--disable-termcap \
-		--enable-symlinks \
-		--enable-widec \
-		--enable-const
+		--enable-widec
 	oh-autobuild -B obj-ncursesw
 	touch $@
 
--
cgit v0.9.1