chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad7f375
)
Makefile: Overwrite the resources by default, rather than merging.
author
Mark Wooding
<mdw@distorted.org.uk>
Sun, 9 Aug 2020 03:34:04 +0000
(
04:34
+0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sun, 9 Aug 2020 03:34:42 +0000
(
04:34
+0100)
Otherwise I can't tell what the effect of removing things is.
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index ac8fa4d34f55de3f0b82843fa17a3fd91861d54f..478cbef25773e39b853c546ab855a4956ec8fc75 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-327,7
+327,7
@@
$(HOME)/.Xdefaults: $(HOME)/.mdw.conf dot/Xdefaults.pterm
ifeq ($(shell case $${DISPLAY-nil} in (:[0-9]*) echo t ;; (*) echo nil ;; esac),t)
dotfile-hook/.Xdefaults = \
ifeq ($(shell case $${DISPLAY-nil} in (:[0-9]*) echo t ;; (*) echo nil ;; esac),t)
dotfile-hook/.Xdefaults = \
- $(call v_tag,XRDB)xrdb -
override
$<
+ $(call v_tag,XRDB)xrdb -
load
$<
endif
endif
endif
endif