Revise Apache installation around macros.

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 18ed116..839bc8d 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -102,21 +102,20 @@ make check
 %{?_with_apache20: %define apache_config apache2.config}
 %{?_with_apache22: %define apache_config apache22.config}
 %if %{?apache_config:1}
-APACHE_CONFD = "no"
 if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
-    APACHE_CONFD=%{_sysconfdir}/httpd/conf.d
+    %define apache_confd %{_sysconfdir}/httpd/conf.d
 else
     if [ -d %{_sysconfdir}/apache2/conf.d ] ; then
-        APACHE_CONFD=%{_sysconfdir}/apache2/conf.d
+        %define apache_confd %{_sysconfdir}/apache2/conf.d
     fi
 fi
-if [ $APACHE_CONFD != "no" ] ; then 
+%if %{?apache_confd:1} 
        if [ ! -f $APACHE_CONFD/shib.conf ] ; then
                sed "s/\/usr\/doc\/shibboleth/\/usr\/share\/doc\/shibboleth-@-VERSION-@/g" \
-                       %{_sysconfdir}/shibboleth/{?apache_config} \
-                       > $APACHE_CONFD/shib.conf
+                       %{_sysconfdir}/shibboleth/%{?apache_config} \
+                       > %{?apache_confd}/shib.conf
        fi
-fi
+%endif
 %endif
 
 # Install the shibd init.d scripts and service