aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-06-26 23:40:10 +1200
committerTom Ryder <tom@sanctum.geek.nz>2017-06-26 23:41:21 +1200
commit2c64dade10d0899284a4b7ef6f3464ff5dfd7cf7 (patch)
treeb0fb01f56eeaaae86546eb957d1704e4525aab4d /Makefile
parentAdd dependency to install-mysql target (diff)
downloaddotfiles-2c64dade10d0899284a4b7ef6f3464ff5dfd7cf7.tar.gz
dotfiles-2c64dade10d0899284a4b7ef6f3464ff5dfd7cf7.zip
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 1 insertions, 10 deletions
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