# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1380817638 0
# Node ID 73910552a8283f2dc1f73f4a9919532b95a1ef80
# Parent  2a21689b0af7968e1b49f12d9615f8d0b6ce337b
apache: keep httpd name

diff -r 2a21689b0af7 -r 73910552a828 apache/receipt
--- a/apache/receipt	Thu Oct 03 09:52:57 2013 +0000
+++ b/apache/receipt	Thu Oct 03 16:27:18 2013 +0000
@@ -26,7 +26,6 @@
 	grep -q Slitaz config.layout || \
 		cat $stuff/slitaz.layout >> config.layout
 	./configure --mandir=/usr/share/man \
-		--with-program-name=apache \
 		--enable-mods-shared=all \
 		--enable-proxy \
 		--enable-ssl \
@@ -57,8 +56,8 @@
 		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
 		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
 		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
-		$fs/etc/apache/apache.conf $fs/etc/apache/extra/httpd-ssl.conf
-	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/apache.conf
+		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
+	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
 }
 
 # Pre and post install commands for Tazpkg.