~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/emacs: Cope with `ido-completing-read+' configuration differences.
[profile]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
f8d0d7e
..
1d32b62
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,10
+21,12
@@
symlink-ok-p = $(shell \
## Silent rules machinery.
V = 0
## Silent rules machinery.
V = 0
-v_tag = $(call v_tag_$V,$1)
-v_tag_0 = @printf " %-8s %s\n" "$1" $(call quote,$@);
V_AT = $(V_AT_$V)
V_AT_0 = @
V_AT = $(V_AT_$V)
V_AT_0 = @
+v_print = $(call v_print_$V,$1,$2)
+v_print_0 = \
+ printf " %-8s %s\n" "$1" $(call quote,$(patsubst $(HOME)/%,~/%,$2));
+v_tag = $(V_AT)$(call v_print_$V,$1,$@)
## Hack.
relax =
## Hack.
relax =
@@
-161,6
+163,11
@@
DOTLINKS += .bashrc .inputrc
.bash_logout_SRC = shell-logout
.zlogout_SRC = shell-logout
.bash_logout_SRC = shell-logout
.zlogout_SRC = shell-logout
+all::
+ $(V_AT)if [ $(HOME)/.zcompdump -ot dot/zshrc ]; then \
+ $(call v_print,ZAP,$(HOME)/.zcompdump)rm -f $(HOME)/.zcompdump; \
+ fi
+
## The Plan 9 `rc' shell. This needs special hacking, because the Linux port
## and Plan 9 From User Space have incompatible syntax.
DOTLINKS += lib/profile
## The Plan 9 `rc' shell. This needs special hacking, because the Linux port
## and Plan 9 From User Space have incompatible syntax.
DOTLINKS += lib/profile
@@
-174,7
+181,8
@@
DOTSUBST += .gitconfig
SCRIPTLINKS += git-copyright-dates
DOTLINKS += .cgrc .tigrc
.gitconfig_SUBSTS = \
SCRIPTLINKS += git-copyright-dates
DOTLINKS += .cgrc .tigrc
.gitconfig_SUBSTS = \
- $(call substvar,releasekey,$(call mdw-conf,release-key,481334C2))
+ $(call substvar,releasekey,$(call mdw-conf,releasekey,481334C2)) \
+ $(call substvar,email,$(call mdw-conf,email,mdw@distorted.org.uk))
$(HOME)/.gitconfig: $(HOME)/.mdw.conf
## PulseAudio.
$(HOME)/.gitconfig: $(HOME)/.mdw.conf
## PulseAudio.
@@
-215,9
+223,12
@@
SCRIPTLINKS += mdw-conf
SCRIPTLINKS += svnwrap
SCRIPTLINKS += guest-console
SCRIPTLINKS += hyperspec
SCRIPTLINKS += svnwrap
SCRIPTLINKS += guest-console
SCRIPTLINKS += hyperspec
+SCRIPTLINKS += datasyms
+SCRIPTLINKS += check-debsyms
+SCRIPTLINKS += check-blkdev-size
## Random odds and ends.
## Random odds and ends.
-DOTLINKS += .
lesskey .
infokey .sqliterc
+DOTLINKS += .infokey .sqliterc
DOTLINKS += .gdbinit .toprc .aspell.conf
DOTLINKS += .dircolors .colordiffrc .screenrc .tmux.conf
DOTLINKS += .cvsrc .indent.pro .ditz-config
DOTLINKS += .gdbinit .toprc .aspell.conf
DOTLINKS += .dircolors .colordiffrc .screenrc .tmux.conf
DOTLINKS += .cvsrc .indent.pro .ditz-config
@@
-243,6
+254,11
@@
DOTLINKS += .mc/ini .mc/panels.ini
DOTLINKS += .parallel/config
.parallel/config_SRC = parallel-config
DOTLINKS += .parallel/config
.parallel/config_SRC = parallel-config
+all:: $(HOME)/.less
+$(HOME)/.less: dot/lesskey
+ $(V_AT)rm -f $(HOME)/.lesskey
+ $(call v_tag,LESSKEY)lesskey -o$@ $<
+
###--------------------------------------------------------------------------
### X11 configuration.
###--------------------------------------------------------------------------
### X11 configuration.
@@
-253,7
+269,8
@@
xtoys_CHECK = xatom
xtoys_DEPS = mlib
DOTLINKS += .xinitrc .xsession .xmodmap .vncrc .vncsession
xtoys_DEPS = mlib
DOTLINKS += .xinitrc .xsession .xmodmap .vncrc .vncsession
-DOTLINKS += .fonts.conf
+DOTLINKS += .config/fontconfig/fonts.conf
+.config/fontconfig/fonts.conf_SRC = fonts.conf
DOTLINKS += .stalonetrayrc
DOTLINKS += .putty/sessions/Default%20Settings
DOTLINKS += .stalonetrayrc
DOTLINKS += .putty/sessions/Default%20Settings