From e078597ce1d2a974d714d493f03b4f6c1f0f2a2c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 23 Mar 2017 17:25:47 +1300 Subject: Use consistent m4 prefix --- Makefile | 14 +++++++------- git/gitconfig.m4 | 8 ++++---- gnupg/gpg.conf.m4 | 4 ++-- tmux/tmux.conf.m4 | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index e907b349..409f265c 100644 --- a/Makefile +++ b/Makefile @@ -119,18 +119,18 @@ clean distclean: git/gitconfig: git/gitconfig.m4 m4 \ - -D DOTFILES_NAME=$(NAME) \ - -D DOTFILES_EMAIL=$(EMAIL) \ - -D DOTFILES_KEY=$(KEY) \ - -D DOTFILES_SENDMAIL=$(SENDMAIL) \ + -D DF_NAME=$(NAME) \ + -D DF_EMAIL=$(EMAIL) \ + -D DF_KEY=$(KEY) \ + -D DF_SENDMAIL=$(SENDMAIL) \ git/gitconfig.m4 > git/gitconfig KEYSERVER = hkps://hkps.pool.sks-keyservers.net gnupg/gpg.conf: gnupg/gpg.conf.m4 m4 \ - -D DOTFILES_HOME=$(HOME) \ - -D DOTFILES_KEYSERVER=$(KEYSERVER) \ + -D DF_HOME=$(HOME) \ + -D DF_KEYSERVER=$(KEYSERVER) \ gnupg/gpg.conf.m4 > gnupg/gpg.conf man/man7/dotfiles.7df: README.markdown man/man7/dotfiles.7df.header @@ -143,7 +143,7 @@ TMUX_BG = colour237 TMUX_FG = colour248 tmux/tmux.conf: tmux/tmux.conf.m4 - m4 -D TMUX_BG=$(TMUX_BG) -D TMUX_FG=$(TMUX_FG) \ + m4 -D DF_TMUX_BG=$(TMUX_BG) -D DF_TMUX_FG=$(TMUX_FG) \ tmux/tmux.conf.m4 > tmux/tmux.conf .awk: diff --git a/git/gitconfig.m4 b/git/gitconfig.m4 index d13e7fdb..f533f02f 100644 --- a/git/gitconfig.m4 +++ b/git/gitconfig.m4 @@ -52,13 +52,13 @@ [sendemail] confirm = compose - smtpServer = DOTFILES_SENDMAIL + smtpServer = DF_SENDMAIL [status] short = true showUntrackedFiles = all [user] - name = DOTFILES_NAME - email = DOTFILES_EMAIL - signingKey = DOTFILES_KEY + name = DF_NAME + email = DF_EMAIL + signingKey = DF_KEY diff --git a/gnupg/gpg.conf.m4 b/gnupg/gpg.conf.m4 index dbbed306..29534991 100644 --- a/gnupg/gpg.conf.m4 +++ b/gnupg/gpg.conf.m4 @@ -22,11 +22,11 @@ fixed-list-mode keyid-format 0xlong # Use a pool of servers which support HKPS (encrypted key retrieval) -keyserver DOTFILES_KEYSERVER +keyserver DF_KEYSERVER # Retrieve keys automatically; check the keyserver port cert; use whichever # server is proffered from the pool -keyserver-options auto-key-retrieve check-cert no-honor-keyserver-url ca-certfile=DOTFILES_HOME/.gnupg/sks-keyservers.net/sks-keyservers.netCA.pem +keyserver-options auto-key-retrieve check-cert no-honor-keyserver-url ca-certfile=DF_HOME/.gnupg/sks-keyservers.net/sks-keyservers.netCA.pem # Include trust/validity for UIDs in listings list-options show-uid-validity diff --git a/tmux/tmux.conf.m4 b/tmux/tmux.conf.m4 index 4e3cce4d..facb91ca 100644 --- a/tmux/tmux.conf.m4 +++ b/tmux/tmux.conf.m4 @@ -113,15 +113,15 @@ set-option -g message-style "bg=colour18,fg=colour231" set-window-option -g mode-style "bg=colour18,fg=colour231" # Pane borders are always in the background color -set-option -g pane-border-style "fg=TMUX_BG" -set-option -g pane-active-border-style "fg=TMUX_BG" +set-option -g pane-border-style "fg=DF_TMUX_BG" +set-option -g pane-active-border-style "fg=DF_TMUX_BG" # Inactive windows have slightly washed-out system colours set-option -g window-style "bg=colour232,fg=colour248" set-option -g window-active-style "bg=colour0,fg=colour15" # The status bar has the defined background and foreground colours -set-option -g status-style "bg=TMUX_BG,fg=TMUX_FG" +set-option -g status-style "bg=DF_TMUX_BG,fg=DF_TMUX_FG" # Titles of windows default to black text with no embellishment set-window-option -g window-status-style "fg=colour16" -- cgit v1.2.3