Fix link and Apache conf install.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2312 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 79960d9..2269592 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -9,7 +9,7 @@ mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
 mod_shib_13_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_13_la_LIBADD = \
-  $(top_builddir)/shibsp/libshibsp.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
@@ -23,7 +23,7 @@ mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
 mod_shib_20_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_20_la_LIBADD = \
-  $(top_builddir)/shibsp/libshibsp.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
@@ -37,7 +37,7 @@ mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
 mod_shib_22_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_22_la_LIBADD = \
-  $(top_builddir)/shibsp/libshibsp.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 9e430bd..1930de9 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -93,16 +93,17 @@ make check
 /sbin/ldconfig
 
 # Plug the SP into Apache on a recognized system.
+APACHE_CONFIG="no"
 if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_13.so ] ; then
-%define apache_config apache.config
+       APACHE_CONFIG="apache.config"
 fi
 if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_20.so ] ; then
-%define apache_config apache2.config
+       APACHE_CONFIG="apache2.config"
 fi
 if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_22.so ] ; then
-%define apache_config apache22.config
+       APACHE_CONFIG="apache22.config"
 fi
-%if %{?apache_config:1}
+if [ "$APACHE_CONFIG" != "no" ] ; then
        APACHE_CONFD="no"
        if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
                APACHE_CONFD="%{_sysconfdir}/httpd/conf.d"
@@ -113,11 +114,11 @@ fi
        if [ "$APACHE_CONFD" != "no" ] ; then
                if [ ! -f $APACHE_CONFD/shib.conf ] ; then
                        sed "s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/%{name}-@-VERSION-@/g" \
-                               %{_sysconfdir}/%{name}/%{?apache_config} \
+                               %{_sysconfdir}/%{name}/$APACHE_CONFIG \
                                > $APACHE_CONFD/shib.conf
                fi
        fi
-%endif
+fi
 
 # Install the shibd init.d scripts and service
 %if "%{_vendor}" == "redhat"