Move kermrc creation to misc/kermrc

[hvlinux.git] / stage5 / pkg / php

diff --git a/stage5/pkg/php b/stage5/pkg/php
index c23ba58..60ed440 100644 (file)
--- a/stage5/pkg/php
+++ b/stage5/pkg/php
@@ -43,17 +43,19 @@ hvbuild_post()
     fi
     cp ${LFS_TMP}/${PACKAGE}/php.ini-production /etc/php.ini
 
-    # To enable PHP support in the Apache web server, a new AddType directive
-    # must be added to the httpd.conf file.
-    if ! grep -q "application/x-httpd-php" /etc/apache/httpd.conf; then
-        echo "AddType application/x-httpd-php .php" >> /etc/apache/httpd.conf
-    fi
+    if [ "x${USE_HTTPD}" = "xyes" ]; then
+        # To enable PHP support in the Apache web server, a new AddType
+        # directive must be added to the httpd.conf file.
+        if ! grep -q "application/x-httpd-php" /etc/httpd/httpd.conf; then
+            echo "AddType application/x-httpd-php .php" >> /etc/httpd/httpd.conf
+        fi
 
-    # Est-ce nécessaire?
-    #cgi.discard_path = 1
+        # Est-ce nécessaire?
+        #cgi.discard_path = 1
 
-    if ! grep -q "DirectoryIndex" /etc/apache/httpd.conf | grep "index.php"; then
-        sed -i -e "s!\(^\s*DirectoryIndex index.html.*\)!\1 index.php!g" \
-            /etc/apache/httpd.conf
+        if ! grep -q "DirectoryIndex" /etc/httpd/httpd.conf | grep "index.php"; then
+            sed -i -e "s!\(^\s*DirectoryIndex index.html.*\)!\1 index.php!g" \
+                /etc/httpd/httpd.conf
+        fi
     fi
 }