From 9b171832c9aec2956b5bfe9e488c2751d1e37dbc Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Sat, 15 Aug 2020 13:57:04 -0400
Subject: move make configuration stuff to mk/

---
 config/architecture  |  1 -
 config/c             |  5 -----
 config/posix         |  6 ------
 config/wordsize      |  2 --
 config/xopen         |  5 -----
 configure            | 14 +++++++-------
 mk/architecture.conf |  1 +
 mk/c.conf            |  5 +++++
 mk/posix.conf        |  6 ++++++
 mk/wordsize.conf     |  2 ++
 mk/xopen.conf        |  5 +++++
 11 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 config/architecture
 delete mode 100644 config/c
 delete mode 100644 config/posix
 delete mode 100644 config/wordsize
 delete mode 100644 config/xopen
 create mode 100644 mk/architecture.conf
 create mode 100644 mk/c.conf
 create mode 100644 mk/posix.conf
 create mode 100644 mk/wordsize.conf
 create mode 100644 mk/xopen.conf

diff --git a/config/architecture b/config/architecture
deleted file mode 100644
index e41c7a05..00000000
--- a/config/architecture
+++ /dev/null
@@ -1 +0,0 @@
-x86	Intel x86
diff --git a/config/c b/config/c
deleted file mode 100644
index 5e7740a9..00000000
--- a/config/c
+++ /dev/null
@@ -1,5 +0,0 @@
-1	ISO/IEC 9899:1990, AKA ANSI X3.159-1989, ANSI C, ISO C, C89, C90
-199409	ISO/IEC 9899:1990/AMD1:1995, AKA C94, C95
-199901	ISO/IEC 9899:1999, AKA C99
-201112	ISO/IEC 9899:2011, AKA C11
-201710	ISO/IEC 9899:2018, AKA C18
diff --git a/config/posix b/config/posix
deleted file mode 100644
index 415a0458..00000000
--- a/config/posix
+++ /dev/null
@@ -1,6 +0,0 @@
-1	POSIX.1-1990 (includes POSIX.1-1988, implies C89)
-2	POSIX.1-1990 plus POSIX.2-1992
-199309	POSIX.1b-1993 (includes POSIX.1-1990)
-199506	POSIX.1-1996
-200112	POSIX.1-2001 (implies C99)
-200809	POSIX.1-2008 (implies C99)
diff --git a/config/wordsize b/config/wordsize
deleted file mode 100644
index 08fdc23a..00000000
--- a/config/wordsize
+++ /dev/null
@@ -1,2 +0,0 @@
-32	32-bit
-64	64-bit
diff --git a/config/xopen b/config/xopen
deleted file mode 100644
index 32748b73..00000000
--- a/config/xopen
+++ /dev/null
@@ -1,5 +0,0 @@
-400	Single Unix Specification, version 1
-	(includes POSIX.1-1990 and POSIX.2-1992)
-500	Single Unix Specification, version 2 (includes POSIX.1-1995)
-600	Single Unix Specification, version 3 (includes POSIX.1-2001)
-700	Single Unix Specification, version 4 (includes POSIX.1-2008)
diff --git a/configure b/configure
index 2c46142c..fbbbb16f 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFIGDIR="$(dirname $0)/config"
+CONFIGDIR="$(dirname $0)/mk"
 
 show_help() {
 	cat <<-EOF
@@ -12,25 +12,25 @@ show_help() {
 	   -d		Enable debugging symbols and asserts
 
 	   -a arch	Choose the underlying architecture to build for:
-	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/architecture)
+	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/architecture.conf)
 
 	   -c version	Conform to:
-	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/c)
+	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/c.conf)
 
 	   -p version	Conform to:
-	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/posix)
+	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/posix.conf)
 
 	   -w wordsize	Choose a word size for the architecuture:
-	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/wordsize)
+	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/wordsize.conf)
 
 	   -x version	Conform to:
-	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/xopen)
+	$(awk '{ printf("\t%s\n", $0); }' ${CONFIGDIR}/xopen.conf)
 
 	EOF
 }
 
 validate_option() {
-	option="${CONFIGDIR}/$1"
+	option="${CONFIGDIR}/$1.conf"
 
 	for opt in $(awk '/^[0-9]/ { print $1 }' "${option}"); do
 		if [ "$2" = "${opt}" ]; then
diff --git a/mk/architecture.conf b/mk/architecture.conf
new file mode 100644
index 00000000..e41c7a05
--- /dev/null
+++ b/mk/architecture.conf
@@ -0,0 +1 @@
+x86	Intel x86
diff --git a/mk/c.conf b/mk/c.conf
new file mode 100644
index 00000000..5e7740a9
--- /dev/null
+++ b/mk/c.conf
@@ -0,0 +1,5 @@
+1	ISO/IEC 9899:1990, AKA ANSI X3.159-1989, ANSI C, ISO C, C89, C90
+199409	ISO/IEC 9899:1990/AMD1:1995, AKA C94, C95
+199901	ISO/IEC 9899:1999, AKA C99
+201112	ISO/IEC 9899:2011, AKA C11
+201710	ISO/IEC 9899:2018, AKA C18
diff --git a/mk/posix.conf b/mk/posix.conf
new file mode 100644
index 00000000..415a0458
--- /dev/null
+++ b/mk/posix.conf
@@ -0,0 +1,6 @@
+1	POSIX.1-1990 (includes POSIX.1-1988, implies C89)
+2	POSIX.1-1990 plus POSIX.2-1992
+199309	POSIX.1b-1993 (includes POSIX.1-1990)
+199506	POSIX.1-1996
+200112	POSIX.1-2001 (implies C99)
+200809	POSIX.1-2008 (implies C99)
diff --git a/mk/wordsize.conf b/mk/wordsize.conf
new file mode 100644
index 00000000..08fdc23a
--- /dev/null
+++ b/mk/wordsize.conf
@@ -0,0 +1,2 @@
+32	32-bit
+64	64-bit
diff --git a/mk/xopen.conf b/mk/xopen.conf
new file mode 100644
index 00000000..32748b73
--- /dev/null
+++ b/mk/xopen.conf
@@ -0,0 +1,5 @@
+400	Single Unix Specification, version 1
+	(includes POSIX.1-1990 and POSIX.2-1992)
+500	Single Unix Specification, version 2 (includes POSIX.1-1995)
+600	Single Unix Specification, version 3 (includes POSIX.1-2001)
+700	Single Unix Specification, version 4 (includes POSIX.1-2008)
-- 
cgit v1.2.1