1From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 19 Jun 2015 17:14:58 +0900
4Subject: [PATCH] Change fixed postconf to a variable for cross-compiling
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
9---
10 Makefile.in     |  2 +-
11 postfix-install | 18 ++++++++++--------
12 2 files changed, 11 insertions(+), 9 deletions(-)
13
14diff --git a/Makefile.in b/Makefile.in
15index 65e7911..40295be 100644
16--- a/Makefile.in
17+++ b/Makefile.in
18@@ -22,7 +22,7 @@ META	= meta/main.cf.proto meta/master.cf.proto meta/postfix-files \
19 EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
20 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
21 SHLIB_DIR_OVERRIDE = \
22-	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
23+	$${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
24
25 default: update
26
27diff --git a/postfix-install b/postfix-install
28index e498cd3..8049f43 100644
29--- a/postfix-install
30+++ b/postfix-install
31@@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && {
32     exit 1
33 }
34
35-test -x bin/postconf || {
36-    echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2
37+test -x "$POSTCONF" || {
38+    echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2
39     exit 1
40 }
41
42@@ -266,7 +266,7 @@ do
43     case "$junk" in
44     *MAIL_VERSION*)
45 	case "$mail_version" in
46-	"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
47+	"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
48 	esac
49 	val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
50 	case "$val" in
51@@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto."
52
53 : ${install_root=/}
54 : ${tempdir=`pwd`}
55-: ${config_directory=`bin/postconf -c conf -h -d config_directory`}
56+: ${config_directory=`$POSTCONF -c conf -h -d config_directory`}
57
58 # Find out the location of installed configuration files.
59
60@@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
61 	case "$junk" in
62 	"") eval unset $name;;
63 	esac
64-	eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -hx $name\`} ||
65+	eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -hx $name\`} ||
66 	    exit 1
67     done
68 }
69@@ -533,7 +533,7 @@ do
70     case "$junk" in
71     "") eval unset $name;;
72     esac
73-    eval : \${$name=\`bin/postconf -c conf -d -hx $name\`} || exit 1
74+    eval : \${$name=\`$POSTCONF -c conf -d -hx $name\`} || exit 1
75 done
76
77 # Override settings manually.
78@@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory
79 SHLIB_DIRECTORY=$install_root$shlib_directory
80 META_DIRECTORY=$install_root$meta_directory
81
82+test "x$POSTCONF" != "x" || POSTCONF="bin/postconf"
83+
84 # Avoid repeated tests for existence of these; default permissions suffice.
85
86 test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
87@@ -841,7 +843,7 @@ IFS="$BACKUP_IFS"
88 # the wrong place when Postfix is being upgraded.
89
90 case "$mail_version" in
91-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
92+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
93 esac
94
95 # Undo MAIL_VERSION expansion at the end of a parameter value. If
96@@ -861,7 +863,7 @@ do
97     esac
98 done
99
100-bin/postconf -c $CONFIG_DIRECTORY -e \
101+"$POSTCONF" -c $CONFIG_DIRECTORY -e \
102     "daemon_directory = $daemon_directory" \
103     "data_directory = $data_directory" \
104     "command_directory = $command_directory" \
105--
1062.17.1
107
108