Use shibboleth-sp as package name for compatibility.

[shibboleth/cpp-sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 96b8823..e5c30ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -10,7 +9,21 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
+DIST_SUBDIRS = \
+       doc \
+       schemas \
+       configs \
+       shibsp \
+       shibd \
+       adfs \
+       plugins \
+       util \
+       apache \
+       nsapi_shib \
+       fastcgi \
+       odbc-store \
+       memcache-store \
+       selinux
 
 if DX_COND_doc
 all-local: doxygen-doc
@@ -18,21 +31,11 @@ else
 all-local:
 endif
 
-dist-hook:
-       rm -rf `find $(distdir)/isapi_shib -name .svn`
-       rm -rf `find $(distdir)/doc/api -name .svn`
-
-GENFILES = shibboleth.spec pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
-    isapi_shib \
-    Shibboleth.sln \
-    libtool.m4 \
-    doxygen.m4 \
-    acx_pthread.m4 \
-    depcomp \
-    config_win32.h \
-    $(GENFILES) \
-    $(GENFILES:%=%.in) \
-    depend \
-    postinstall
+       isapi_shib \
+       Shibboleth.sln \
+       config_win32.h \
+       $(GENFILES) \
+       $(GENFILES:%=%.in)