You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

78 lines
2.8 KiB

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