Fixes from RPM build

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

diff --git a/Makefile.am b/Makefile.am
index 0c64f62..204c622 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd util apache odbc-store nsapi_shib selinux
+DIST_SUBDIRS = doc schemas configs shibsp shibd util apache nsapi_shib selinux
 
 all-local: shibboleth.spec pkginfo
 

diff --git a/selinux/Makefile.am b/selinux/Makefile.am
index b315719..f404e4d 100644 (file)
--- a/selinux/Makefile.am
+++ b/selinux/Makefile.am
@@ -22,4 +22,4 @@ shibshar.fc: ${srcdir}/shibshar.fc.in Makefile ${top_builddir}/config.status
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp
 
-EXTRA_DIST = .cvsignore shibshar.fc.in shibshar.te
+EXTRA_DIST = shibshar.fc.in shibshar.te

diff --git a/util/Makefile.am b/util/Makefile.am
index 9043826..c6abaa4 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,7 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-bin_PROGRAMS = samlquery siterefresh
+bin_PROGRAMS = samlquery
+sbin_PROGRAMS = siterefresh
 
 samlquery_SOURCES = samlquery.cpp