From 9aa820e885ad639f1518914db298455d6fec3177 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 13 Jun 2017 21:13:56 +1200 Subject: Refactor m4 macro names mi5(1df) means I can simplify these quite a bit now --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d782cd2b..32a61ef0 100644 --- a/Makefile +++ b/Makefile @@ -286,16 +286,18 @@ bin/urlc.sh: bin/urlc.m4 include/mktd.m4 git/gitconfig: git/gitconfig.m4 m4 \ - -D DF_NAME=$(NAME) \ - -D DF_EMAIL=$(EMAIL) \ - -D DF_KEY=$(KEY) \ - -D DF_SENDMAIL=$(SENDMAIL) \ + -D NAME=$(NAME) \ + -D EMAIL=$(EMAIL) \ + -D KEY=$(KEY) \ + -D SENDMAIL=$(SENDMAIL) \ git/gitconfig.m4 > $@ KEYSERVER = hkps://hkps.pool.sks-keyservers.net gnupg/gpg.conf: gnupg/gpg.conf.m4 - m4 -D DF_HOME=$(HOME) -D DF_KEYSERVER=$(KEYSERVER) \ + m4 \ + -D HOME=$(HOME) \ + -D KEYSERVER=$(KEYSERVER) \ gnupg/gpg.conf.m4 > $@ man/man7/dotfiles.7df: README.markdown man/man7/dotfiles.7df.header @@ -308,7 +310,9 @@ TMUX_BG = colour237 TMUX_FG = colour248 tmux/tmux.conf: tmux/tmux.conf.m4 - m4 -D DF_TMUX_BG=$(TMUX_BG) -D DF_TMUX_FG=$(TMUX_FG) \ + m4 \ + -D BG=$(TMUX_BG) \ + -D FG=$(TMUX_FG) \ tmux/tmux.conf.m4 > $@ install: install-bin \ -- cgit v1.2.3