| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | --- a/conf/post-install |
| 2 | +++ b/conf/post-install |
| 3 | @@ -366,10 +366,10 @@ test -f $config_directory/main.cf && { |
| 4 | |
| 5 | # Sanity checks |
| 6 | |
| 7 | -case $manpage_directory in |
| 8 | - no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2 |
| 9 | - echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;; |
| 10 | -esac |
| 11 | +#case $manpage_directory in |
| 12 | +# no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2 |
| 13 | +# echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;; |
| 14 | +#esac |
| 15 | |
| 16 | case $setgid_group in |
| 17 | no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2 |
| 18 | @@ -377,7 +377,7 @@ case $setgid_group in |
| 19 | esac |
| 20 | |
| 21 | for path in "$daemon_directory" "$command_directory" "$queue_directory" \ |
| 22 | - "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \ |
| 23 | + "$sendmail_path" "$newaliases_path" "$mailq_path" \ |
| 24 | "$meta_directory" |
| 25 | do |
| 26 | case "$path" in |
| 27 | @@ -386,7 +386,7 @@ do |
| 28 | esac |
| 29 | done |
| 30 | |
| 31 | -for path in "$html_directory" "$readme_directory" "$shlib_directory" |
| 32 | +for path in "$html_directory" "$readme_directory" "$shlib_directory" "$manpage_directory" |
| 33 | do |
| 34 | case "$path" in |
| 35 | /*) ;; |
| 36 | --- a/postfix-install |
| 37 | +++ b/postfix-install |
| 38 | @@ -563,13 +563,13 @@ case "$setgid_group" in |
| 39 | exit 1;; |
| 40 | esac |
| 41 | |
| 42 | -case "$manpage_directory" in |
| 43 | - no) (echo $0: Error: the manpage_directory parameter no longer accepts |
| 44 | - echo \"no\" values. Try again with \"manpage_directory=/path/name\" |
| 45 | - echo on the command line or execute \"make install\" and specify |
| 46 | - echo manpage_directory interactively.) | ${FMT} 1>&2 |
| 47 | - exit 1;; |
| 48 | -esac |
| 49 | +#case "$manpage_directory" in |
| 50 | +# no) (echo $0: Error: the manpage_directory parameter no longer accepts |
| 51 | +# echo \"no\" values. Try again with \"manpage_directory=/path/name\" |
| 52 | +# echo on the command line or execute \"make install\" and specify |
| 53 | +# echo manpage_directory interactively.) | ${FMT} 1>&2 |
| 54 | +# exit 1;; |
| 55 | +#esac |
| 56 | |
| 57 | for path in "$html_directory" "$readme_directory" "$shlib_directory" |
| 58 | do |
| 59 | @@ -582,7 +582,7 @@ do |
| 60 | done |
| 61 | |
| 62 | for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \ |
| 63 | - "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \ |
| 64 | + "$sendmail_path" "$newaliases_path" "$mailq_path" \ |
| 65 | "$meta_directory" |
| 66 | do |
| 67 | case "$path" in |
| 68 | @@ -789,8 +789,8 @@ do |
| 69 | compare_or_replace $mode "$owner" "$group" html/$file \ |
| 70 | $HTML_DIRECTORY/$file || exit 1;; |
| 71 | '$manpage_directory') |
| 72 | - check_parent $MANPAGE_DIRECTORY/$file || exit 1 |
| 73 | - compare_or_replace $mode "$owner" "$group" man/$file \ |
| 74 | + test "$manpage_directory" = "no" || check_parent $MANPAGE_DIRECTORY/$file || exit 1 |
| 75 | + test "$manpage_directory" = "no" || compare_or_replace $mode "$owner" "$group" man/$file \ |
| 76 | $MANPAGE_DIRECTORY/$file || exit 1;; |
| 77 | '$readme_directory') |
| 78 | test "$readme_directory" = "no" || |