X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=0c5a5087d20c2038d754d4136f36df8562b7e5fa;hb=aad3cc122bf1227d27418b072c9bf91a47152fe6;hp=e04a6da2077bc86468a18b21ec03f6a1c3e1a9c0;hpb=6ba868153806e6edb5ef4a5631a2da5e3002840f;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/Makefile.am b/Makefile.am
index e04a6da..0c5a508 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -11,7 +10,7 @@ dist-hook:
 	rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-SUBDIRS = doc schemas xmltooling xmltoolingtest
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
 if DX_COND_doc
 all-local: doxygen-doc
@@ -20,20 +19,17 @@ all-local:
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xmltooling.pc
+pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-GENFILES = xmltooling.spec xmltooling.pc pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
-        cpp-xmltooling.sln \
-        acx_pthread.m4 \
-        acinclude.m4 \
-        ax_create_pkgconfig_info.m4 \
-        libtool.m4 \
-        doxygen.m4 \
-        depcomp \
+        cpp-@PACKAGE_NAME@.sln \
+        m4/acx_pthread.m4 \
+        m4/acinclude.m4 \
+        m4/ax_create_pkgconfig_info.m4 \
+        m4/doxygen.m4 \
         config_win32.h \
         $(GENFILES) \
         $(GENFILES:%=%.in) \
-        depend \
         postinstall