From cfdbf6118222bc73d4e4f527a91f40f2f90275cd Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 5 Feb 2021 12:02:26 +0100 Subject: [PATCH] Respect DESTDIR when considering whether or not to install config files ... with ".new" extension. --- GNUmakefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index e5fdc642..fcd44c4f 100644 --- 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;\ -- 2.39.2