Vendor-specific name for shibd script.

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 20e2810..4b2f134 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -9,7 +9,7 @@ pkgxmldir = $(datadir)/xml/@PACKAGE@
 varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
-       shibd \
+       shibd-redhat \
        apache.config \
        apache2.config \
        apache22.config
@@ -67,7 +67,7 @@ apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.stat
 apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-shibd: ${srcdir}/shibd.in Makefile ${top_builddir}/config.status
+shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
@@ -114,7 +114,7 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
-       shibd \
+       shibd-redhat \
        shibd.logger \
        native.logger \
        shibboleth2.xml \
@@ -132,5 +132,5 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
-       shibd.in \
+       shibd-redhat.in \
        $(CONFIGFILES)

diff --git a/configs/shibd.in b/configs/shibd-redhat.in
similarity index 100%
rename from configs/shibd.in
rename to configs/shibd-redhat.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 1f41794..3f0b312 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -141,7 +141,7 @@ fi
 %if "%{_vendor}" == "redhat"
        if [ -d %{_sysconfdir}/init.d ] ; then
                if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
-                       cp -p %{_sysconfdir}/%{name}/shibd %{_sysconfdir}/init.d/shibd
+                       cp -p %{_sysconfdir}/%{name}/shibd-%{_vendor} %{_sysconfdir}/init.d/shibd
                        chmod 755 %{_sysconfdir}/init.d/shibd
                        chkconfig --add shibd
                fi