projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84aea7f
)
Respect DESTDIR when considering whether or not to install config files
author
Fabian Keil
<fk@fabiankeil.de>
Fri, 5 Feb 2021 11:02:26 +0000
(12:02 +0100)
committer
Fabian Keil
<fk@fabiankeil.de>
Sun, 21 Feb 2021 15:09:20 +0000
(16:09 +0100)
... with ".new" extension.
GNUmakefile.in
patch
|
blob
|
history
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
e5fdc64
..
fcd44c4
100644
(file)
--- a/
GNUmakefile.in
+++ b/
GNUmakefile.in
@@
-968,7
+968,7
@@
install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+ elif [ -s "$(
DESTDIR)$(
CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
NEW=1;\