From ae6fce051fc01e0caf9f3984695b21433dd81a0a Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Tue, 21 Aug 2018 12:54:15 +0200
Subject: [PATCH] install_httpd-2.4.sh: if 'make install' failed, try 'make
 install' again (is needed for version 2.4.34).

---
 install_httpd-2.4.sh | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/install_httpd-2.4.sh b/install_httpd-2.4.sh
index 895c39c..767f031 100755
--- a/install_httpd-2.4.sh
+++ b/install_httpd-2.4.sh
@@ -1816,14 +1816,28 @@ else
    echo_failed
    error "Installing apache-${APACHE_VERSION} failed."
 
-	echononl "continue anyway [yes/no]: "
-	read OK
-	OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
-	while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
-		echononl "Wrong entry! - repeat [yes/no]: "
-		read OK
-	done
-	[[ $OK = "yes" ]] || fatal "Abbruch durch User"
+   echononl "\tTrying again..."
+   echo "## - Trying to install apache-${APACHE_VERSION} again.." >> ${_logdir}/main.log
+   echo "## -" >> ${_logdir}/main.log
+   echo "## - See ${_logdir}/httpd-make_install_again.log for more details" >> ${_logdir}/main.log
+   echo "## -" >> ${_logdir}/main.log
+   echo "make install > ${_logdir}/httpd-make_install_again.log 2>&1" >> ${_logdir}/main.log
+   make install > ${_logdir}/httpd-make_install_again.log 2>&1
+
+   if [ "$?" = "0" ]; then
+      echo_ok
+   else
+      echo_failed
+
+      echononl "continue anyway [yes/no]: "
+      read OK
+      OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+      while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+         echononl "Wrong entry! - repeat [yes/no]: "
+         read OK
+      done
+      [[ $OK = "yes" ]] || fatal "Abbruch durch User"
+   fi
 
 fi