2022-02-24 14:46:51 +00:00
|
|
|
diff --git a/config/aerc.conf b/config/aerc.conf
|
2022-04-14 02:27:22 +00:00
|
|
|
index fbbf587..ede1a03 100644
|
2022-02-24 14:46:51 +00:00
|
|
|
--- a/config/aerc.conf
|
|
|
|
|
+++ b/config/aerc.conf
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -107,8 +107,7 @@ next-message-on-delete=true
|
2022-02-24 14:46:51 +00:00
|
|
|
#
|
2022-04-14 02:27:22 +00:00
|
|
|
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
|
|
|
|
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
2022-02-24 14:46:51 +00:00
|
|
|
-# /usr/local/share/aerc/stylesets
|
|
|
|
|
-# /usr/share/aerc/stylesets
|
|
|
|
|
+# @out@/share/aerc/stylesets
|
|
|
|
|
#
|
|
|
|
|
# default: ""
|
|
|
|
|
stylesets-dirs=
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -254,8 +253,7 @@ new-email=
|
2022-02-24 14:46:51 +00:00
|
|
|
#
|
2022-04-14 02:27:22 +00:00
|
|
|
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
|
|
|
|
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
2022-02-24 14:46:51 +00:00
|
|
|
-# /usr/local/share/aerc/templates
|
|
|
|
|
-# /usr/share/aerc/templates
|
|
|
|
|
+# @out@/share/aerc/templates
|
|
|
|
|
#
|
|
|
|
|
# default: ""
|
|
|
|
|
template-dirs=
|
2019-10-28 14:40:31 +00:00
|
|
|
diff --git a/config/config.go b/config/config.go
|
2022-04-14 02:27:22 +00:00
|
|
|
index 2120310..92b7655 100644
|
2019-10-28 14:40:31 +00:00
|
|
|
--- a/config/config.go
|
|
|
|
|
+++ b/config/config.go
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -331,8 +331,8 @@ func buildDefaultDirs() []string {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Add fixed fallback locations
|
|
|
|
|
- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
|
|
|
|
|
- defaultDirs = append(defaultDirs, "/usr/share/aerc")
|
|
|
|
|
+ defaultDirs = append(defaultDirs, "@out@/local/share/aerc")
|
|
|
|
|
+ defaultDirs = append(defaultDirs, "@out@/share/aerc")
|
2022-02-24 14:46:51 +00:00
|
|
|
|
2022-04-14 02:27:22 +00:00
|
|
|
return defaultDirs
|
|
|
|
|
}
|
2022-02-24 14:46:51 +00:00
|
|
|
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
|
2022-04-14 02:27:22 +00:00
|
|
|
index 885c4f8..77a853e 100644
|
2022-02-24 14:46:51 +00:00
|
|
|
--- a/doc/aerc-config.5.scd
|
|
|
|
|
+++ b/doc/aerc-config.5.scd
|
|
|
|
|
@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus
|
|
|
|
|
"aerc", which defaults to ~/.config/aerc.
|
|
|
|
|
|
|
|
|
|
Examples of these config files are typically included with your installation of
|
|
|
|
|
-aerc and are usually installed in /usr/share/aerc.
|
2022-04-14 02:27:22 +00:00
|
|
|
+aerc and are usually installed in @out@/share/aerc.
|
2022-02-24 14:46:51 +00:00
|
|
|
|
|
|
|
|
Each file uses the _ini_ format, and consists of sections with keys and values.
|
|
|
|
|
A line beginning with # is considered a comment and ignored, as are empty lines.
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf.
|
2022-02-24 14:46:51 +00:00
|
|
|
```
|
2022-04-14 02:27:22 +00:00
|
|
|
${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
|
|
|
|
${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
2022-02-24 14:46:51 +00:00
|
|
|
- /usr/local/share/aerc/stylesets
|
|
|
|
|
- /usr/share/aerc/stylesets
|
|
|
|
|
+ @out@/share/aerc/stylesets
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
Default: ""
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a
|
2022-02-24 14:46:51 +00:00
|
|
|
subject which contains "text". Use header,~regex to match against a regex.
|
|
|
|
|
|
2022-04-14 02:27:22 +00:00
|
|
|
aerc ships with some default filters installed in the share directory (usually
|
2022-02-24 14:46:51 +00:00
|
|
|
-_/usr/share/aerc/filters_). Note that these may have additional dependencies
|
2022-04-14 02:27:22 +00:00
|
|
|
+_@out@/share/aerc/filters_). Note that these may have additional dependencies
|
|
|
|
|
that aerc does not have alone.
|
2022-02-24 14:46:51 +00:00
|
|
|
|
|
|
|
|
## TRIGGERS
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the
|
2022-02-24 14:46:51 +00:00
|
|
|
template name.
|
|
|
|
|
|
2022-04-14 02:27:22 +00:00
|
|
|
aerc ships with some default templates installed in the share directory (usually
|
2022-02-24 14:46:51 +00:00
|
|
|
-_/usr/share/aerc/templates_).
|
2022-04-14 02:27:22 +00:00
|
|
|
+_@out@/share/aerc/templates_).
|
2022-02-24 14:46:51 +00:00
|
|
|
|
|
|
|
|
These options are configured in the *[templates]* section of aerc.conf.
|
|
|
|
|
|
2022-04-14 02:27:22 +00:00
|
|
|
@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf.
|
2022-02-24 14:46:51 +00:00
|
|
|
```
|
2022-04-14 02:27:22 +00:00
|
|
|
${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
|
|
|
|
${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
2022-02-24 14:46:51 +00:00
|
|
|
- /usr/local/share/aerc/templates
|
|
|
|
|
- /usr/share/aerc/templates
|
|
|
|
|
+ @out@/share/aerc/templates
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
Default: ""
|
