2003-01-28 Havoc Pennington <hp@pobox.com>

	* test/Makefile.am (dist-hook): fix make distdir

	* dbus/Makefile.am (TESTS_ENVIRONMENT): fix make check

diff --git a/ChangeLog b/ChangeLog
index 8530244db8fc8f5c522ce745e44ca3f026439803..9eea1d58aab128083430733978adaf9b6d2572c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  Havoc Pennington  <hp@pobox.com>
+
+       * test/Makefile.am (dist-hook): fix make distdir
+
+       * dbus/Makefile.am (TESTS_ENVIRONMENT): fix make check
+
 2003-01-27  Havoc Pennington  <hp@pobox.com>
 
        * dbus/dbus-mempool.c (time_for_size): replace printf with 

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 3f6bb63f6881fbecf42d8fbf822fed82241e4f66..322f86a71caf59f688d10a512c09fa53d70a1f8e 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -83,7 +83,7 @@ libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT="DBUS_TEST_DATA=$(top_srcdir)/test/data"
+TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_srcdir)/test/data
 TESTS=dbus-test
 else
 TESTS=

diff --git a/test/Makefile.am b/test/Makefile.am
index f0118ee6c7e17383d7ca993c832c697d590db5ea..a2139166cf092ec35870377c91ca6cc789492d30 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,12 +25,12 @@ echo_client_LDADD=$(TEST_LIBS)
 echo_server_LDADD=$(TEST_LIBS)
 
 dist-hook:
-       DIRS="data data/valid-messages" ;                       \
-       for D in $DIRS; do                                      \
-               test -d $(distdir)/$D || mkdir $(distdir)/$D ;  \
-       done ;                                                  \
-       FILES=`find -name "*.message"` ;                        \
-        for F in $FILES; do                                    \
-                echo '-- Disting file '$$F ;                   \
-               cp $F $(distdir)/$$F ;                          \
+       DIRS="data data/valid-messages data/invalid-messages data/incomplete-messages" ; \
+       for D in $$DIRS; do                                             \
+               test -d $(distdir)/$$D || mkdir $(distdir)/$$D ;        \
+       done ;                                                          \
+       FILES=`find -name "*.message"` ;                                \
+        for F in $$FILES; do                                           \
+                echo '-- Disting file '$$F ;                           \
+               cp $$F $(distdir)/$$F ;                                 \
        done