Mercurial > hg > nginx

diff auto/install @ 6425:05c894a598ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dynamic modules: do not overwrite old modules on install. Just using "cp" is incorrect, as it will overwrite old files possibly used by OS, leading to unexpected effects. Changed to "mv + cp", much like used for the main binary.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 10 Mar 2016 16:50:13 +0300
parents 39a806ccf21e
children 1cbd7f87c6ed
line wrap: on
line diff
--- a/auto/install
+++ b/auto/install
@@ -169,17 +169,31 @@ END
 fi
 
 
-if test -n "$NGX_MODULES"; then
+if test -n "$DYNAMIC_MODULES"; then
     cat << END                                                >> $NGX_MAKEFILE
 
 	test -d '\$(DESTDIR)$NGX_MODULES_PATH' \
 		|| mkdir -p '\$(DESTDIR)$NGX_MODULES_PATH'
-	cp $NGX_MODULES '\$(DESTDIR)$NGX_MODULES_PATH'
 END
 
 fi
 
 
+for ngx_module in $DYNAMIC_MODULES
+do
+    ngx_module=$ngx_module$ngx_modext
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+	test ! -f '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \
+		|| mv '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \
+			'\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module.old'
+	cp $NGX_OBJS/$ngx_module '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module'
+END
+
+done
+
+
 # create Makefile
 
 cat << END >> Makefile