From e7ea15594afe51b8cb823a05e004cb01eec2eb1a Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Fri, 30 Mar 2018 14:17:06 +0200
Subject: [PATCH] fixed config-site.php reference in config.php

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 Makefile.in   | 5 ++++-
 config.php.in | 2 +-
 configure     | 5 +----
 configure.in  | 4 +---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7ea5ef91..f99af0d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,7 +33,7 @@ INSTALL = @INSTALL@
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 	piler-config.h stamp.h stamp-h1 params.h
 
-all: all-recursive
+all: all-recursive config-php
 install: installdirs install-recursive
 
 
@@ -63,6 +63,9 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 
+config-php:
+	sed "s%SYSCONFDIR%$(sysconfdir)%" config.php.in > webui/config.php
+
 
 installdirs: mkinstalldirs
 	$(srcdir)/mkinstalldirs \
diff --git a/config.php.in b/config.php.in
index a336d2a7..56414af7 100644
--- a/config.php.in
+++ b/config.php.in
@@ -320,7 +320,7 @@ define('NOW', time());
  * normally you don't have to change anything below
  */
 
-require_once '@sysconfdir@/piler/config-site.php';
+require_once 'SYSCONFDIR/piler/config-site.php';
 
 ini_set('session.cookie_lifetime', $config['SESSION_EXPIRY']);
 
diff --git a/configure b/configure
index 5cb44902..c181781c 100755
--- a/configure
+++ b/configure
@@ -4860,7 +4860,7 @@ CFLAGS="$static -O2 -Wall -g"
 LIBS="$antispam_libs $sunos_libs "
 OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs"
 
-ac_config_files="$ac_config_files Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile config.php"
+ac_config_files="$ac_config_files Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5560,7 +5560,6 @@ do
     "init.d/Makefile") CONFIG_FILES="$CONFIG_FILES init.d/Makefile" ;;
     "unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;;
     "contrib/imap/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/imap/Makefile" ;;
-    "config.php") CONFIG_FILES="$CONFIG_FILES config.php" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -6182,8 +6181,6 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-mv config.php webui/config.php
-
 echo
 echo
 echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/wiki/current:upgrade"
diff --git a/configure.in b/configure.in
index 828ed4a3..5a1384ae 100644
--- a/configure.in
+++ b/configure.in
@@ -538,11 +538,9 @@ CFLAGS="$static -O2 -Wall -g"
 LIBS="$antispam_libs $sunos_libs "
 OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs"
 
-AC_CONFIG_FILES([Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile config.php])
+AC_CONFIG_FILES([Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile])
 AC_OUTPUT
 
-mv config.php webui/config.php
-
 echo
 echo
 echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/wiki/current:upgrade"