Makefile fixes, macro fix

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 4bf8fb3..9796c35 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -4,6 +4,8 @@ lib_LTLIBRARIES = libsaml.la
 
 libsamlincludedir = $(includedir)/saml
 
+sigincludedir = $(includedir)/signature
+
 utilincludedir = $(includedir)/saml/util
 
 saml1coreincludedir = $(includedir)/saml/saml1/core

diff --git a/saml/saml1/core/impl/ProtocolsImpl.cpp b/saml/saml1/core/impl/ProtocolsImpl.cpp
index 1c6ee51..fd2b330 100644 (file)
--- a/saml/saml1/core/impl/ProtocolsImpl.cpp
+++ b/saml/saml1/core/impl/ProtocolsImpl.cpp
@@ -95,7 +95,7 @@ namespace opensaml {
             }
             
             IMPL_XMLOBJECT_CLONE(RespondWith);
-            IMPL_XMLOBJECT_CONTENT();
+            IMPL_XMLOBJECT_CONTENT;
         };
 
         class SAML_DLLLOCAL SubjectQueryImpl : public virtual SubjectQuery,

diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 394483f..77ef05b 100644 (file)
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -9,9 +9,9 @@ endif
 
 samltest_h = \
     samltest.h \
-    saml/signature/SAML1AssertionTest.h \
-    saml/signature/SAML1RequestTest.h \
-    saml/signature/SAML1ResponseTest.h \
+    signature/SAML1AssertionTest.h \
+    signature/SAML1RequestTest.h \
+    signature/SAML1ResponseTest.h \
     saml1/core/impl/ActionTest.h \
     saml1/core/impl/AdviceTest.h \
     saml1/core/impl/AssertionIDReferenceTest.h \