From 2c64dade10d0899284a4b7ef6f3464ff5dfd7cf7 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 26 Jun 2017 23:40:10 +1200
Subject: Revert "Allow MYSQL_* my.cnf vars"

This reverts commit bc204d546eacaf82ced744838cd5a06ff8bcdde0.

Scratch that; this approach doesn't work because if the strings are
empty from the Makefile macro, m4 still considers them defined. A
different approach is needed here.
---
 .gitignore       |  2 --
 Makefile         | 11 +----------
 mysql/my.cnf     |  6 ++++++
 mysql/my.cnf.mi5 | 11 -----------
 4 files changed, 7 insertions(+), 23 deletions(-)
 create mode 100644 mysql/my.cnf
 delete mode 100644 mysql/my.cnf.mi5

diff --git a/.gitignore b/.gitignore
index 34a350ba..c4a552f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,4 @@ gnupg/gpg.conf
 gnupg/gpg.conf.m4
 include/mktd.m4
 man/man7/dotfiles.7df
-mysql/my.cnf
-mysql/my.cnf.m4
 urxvt/ext/select
diff --git a/Makefile b/Makefile
index 83d68893..8818e524 100644
--- a/Makefile
+++ b/Makefile
@@ -247,8 +247,6 @@ clean distclean:
 		gnupg/gpg.conf.m4 \
 		include/mktd.m4 \
 		man/man8/dotfiles.7df \
-		mysql/my.cnf \
-		mysql/my.cnf.m4 \
 		urxvt/ext/select
 
 .awk:
@@ -305,13 +303,6 @@ man/man7/dotfiles.7df: README.markdown man/man7/dotfiles.7df.header
 	cat man/man7/dotfiles.7df.header README.markdown | \
 		pandoc -sS -t man -o $@
 
-mysql/my.cnf: mysql/my.cnf.m4
-	m4 \
-		-D MYSQL_HOST=$(MYSQL_HOST) \
-		-D MYSQL_USER=$(MYSQL_USER) \
-		-D MYSQL_PASSWORD=$(MYSQL_PASSWORD) \
-		mysql/my.cnf.m4 > $@
-
 MAILDIR = $(HOME)/Mail
 
 install: install-bin \
@@ -420,7 +411,7 @@ install-newsbeuter:
 	mkdir -p -- $(HOME)/.config/newsbeuter $(HOME)/.local/share/newsbeuter
 	cp -p -- newsbeuter/config $(HOME)/.config/newsbeuter
 
-install-mysql: mysql/my.cnf
+install-mysql:
 	cp -p -- mysql/my.cnf $(HOME)/.my.cnf
 
 install-ksh: check-ksh install-sh
diff --git a/mysql/my.cnf b/mysql/my.cnf
new file mode 100644
index 00000000..900cf1a9
--- /dev/null
+++ b/mysql/my.cnf
@@ -0,0 +1,6 @@
+[mysql]
+default-character-set=utf8
+no-auto-rehash
+prompt='(\u@\h:\d) mysql> '
+safe-updates
+skip-pager
diff --git a/mysql/my.cnf.mi5 b/mysql/my.cnf.mi5
deleted file mode 100644
index 810f5165..00000000
--- a/mysql/my.cnf.mi5
+++ /dev/null
@@ -1,11 +0,0 @@
-[mysql]
-default-character-set=utf8
-no-auto-rehash
-prompt='(\u@\h:\d) mysql> '
-safe-updates
-skip-pager
-
-[client]
-<% ifdef(`MYSQL_HOST', ``host='MYSQL_HOST', `dnl') %>
-<% ifdef(`MYSQL_USER', ``user='MYSQL_USER', `dnl') %>
-<% ifdef(`MYSQL_PASSWORD', ``password='MYSQL_PASSWORD', `dnl') %>
-- 
cgit v1.2.3