]> granicus.if.org Git - neomutt/commitdiff
Update autosetup to latest master branch
authorPietro Cerutti <gahr@gahr.ch>
Mon, 23 Oct 2017 08:04:37 +0000 (08:04 +0000)
committerRichard Russon <rich@flatcap.org>
Mon, 23 Oct 2017 11:59:13 +0000 (12:59 +0100)
This includes the fix for a more fine-grained interaction between
$prefix, /etc, and /var.
See https://github.com/msteveb/autosetup/issues/31.

autosetup/system.tcl

index f049d31fe7778a8ed350e271baa4ac81180c5616..2085fcfaffe3ca5a6c3c7fc5f6a860bb3728483c 100644 (file)
@@ -283,15 +283,19 @@ foreach {name defpath} {
 }
 foreach {name defpath} {
        datadir /share
-       sysconfdir /etc
        sharedstatedir /com
-       localstatedir /var
        infodir /share/info
        mandir /share/man
        includedir /include
 } {
        define $name [lindex [opt-val $name $prefix$defpath] end]
 }
+if {$prefix ne {/usr}} {
+       define sysconfdir [lindex [opt-val sysconfdir $prefix/etc] end]
+} else {
+       define sysconfdir [lindex [opt-val sysconfdir /etc] end]
+}
+define localstatedir [lindex [opt-val localstatedir /var] end]
 
 define SHELL [get-env SHELL [find-an-executable sh bash ksh]]