diff options
| author | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
|---|---|---|
| committer | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
| commit | a93dfebb9e7a34ffba9b1ae5e8e496dfab4c3c43 (patch) | |
| tree | 6c38a4617c92398269e6603a0509fc3006811368 /recipes/postfix/files/install.patch | |
| parent | 4255898da29e7e0c521d064afedbc4075b3e8155 (diff) | |
| parent | d7fdcef3d8c8b80926d579c2db179b594429cebe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/postfix/files/install.patch')
| -rw-r--r-- | recipes/postfix/files/install.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes/postfix/files/install.patch b/recipes/postfix/files/install.patch new file mode 100644 index 0000000000..baffcce0e8 --- /dev/null +++ b/recipes/postfix/files/install.patch @@ -0,0 +1,63 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- postfix-2.0.15/postfix-install~install.patch ++++ postfix-2.0.15/postfix-install +@@ -187,8 +187,8 @@ + exit 1 + } + +-test -x bin/postconf || { +- echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2 ++test -x $POSTCONF || { ++ echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2 + exit 1 + } + +@@ -336,7 +336,7 @@ + + : ${install_root=/} + : ${tempdir=`pwd`} +-: ${config_directory=`bin/postconf -h -d config_directory`} ++: ${config_directory=`$POSTCONF -h -d config_directory`} + + # Find out the location of installed configuration files. + +@@ -399,7 +399,7 @@ + case "$junk" in + "") eval unset $name;; + esac +- eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -h $name\`} || ++ eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -h $name\`} || + exit 1 + done + } +@@ -414,7 +414,7 @@ + case "$junk" in + "") eval unset $name;; + esac +- eval : \${$name=\`bin/postconf -d -h $name\`} || exit 1 ++ eval : \${$name=\`$POSTCONF -d -h $name\`} || exit 1 + done + + # Override settings manually. +@@ -521,6 +521,8 @@ + SAMPLE_DIRECTORY=$install_root$sample_directory + README_DIRECTORY=$install_root$readme_directory + ++test "x$POSTCONF" != "x" || POSTCONF="bin/postconf" ++ + # Avoid repeated tests for existence of these; default permissions suffice. + + test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 +@@ -639,7 +641,7 @@ + # Postfix releases, and software should not suddenly be installed in + # the wrong place when Postfix is being upgraded. + +-bin/postconf -c $CONFIG_DIRECTORY -e \ ++$POSTCONF -c $CONFIG_DIRECTORY -e \ + "daemon_directory = $daemon_directory" \ + "command_directory = $command_directory" \ + "queue_directory = $queue_directory" \ |