When $readme_directory and/or $html_directory are set to 'no', omit their
files from meta/postfix-files. This ensures that 'postfix set-permissions'
succeeds when those files are missing from the installation.
---
Tested on FreeBSD with the postfix stable (3.9) and postfix-current (devel)
ports. Not sure if this is the cleanest implementation, but it works for what
it needs to do.
postfix/Makefile.in | 6 +++++-
postfix/makedefs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/postfix/Makefile.in b/postfix/Makefile.in
index 6f2d06491..87f0aa67b 100644
--- a/postfix/Makefile.in
+++ b/postfix/Makefile.in
@@ -79,7 +79,11 @@ meta/postfix-files: conf/postfix-files conf/makedefs.out
Makefile
if (have[$$1]) print; next } \
{ print } \
'; \
- fi) | case "$(MAKE_FIX)" in \
+ fi) | ( \
+ [ -z "$(readme_directory)" -o "$(readme_directory)" = "no" ] &&
omit_readme='/^\$$readme_directory/d'; \
+ [ -z "$(html_directory)" -o "$(html_directory)" = "no" ] &&
omit_html='/^\$$html_directory/d'; \
+ sed -e "$${omit_readme}" -e "$${omit_html}" \
+ ) | case "$(MAKE_FIX)" in \
*) cat;; \
esac > $@
diff --git a/postfix/makedefs b/postfix/makedefs
index 430324d4e..f590cb289 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -1034,7 +1034,7 @@ EOF
process_input_parameter()
{
- echo "#" $parm_name=$parm_val
+ echo $parm_name=$parm_val
case "$parm_val" in
*MAIL_VERSION*)
cparm_val=`echo "$parm_val" | \
--
2.45.2
_______________________________________________
Postfix-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
