diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-01-28 03:56:55 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-01-28 03:56:55 +0000 |
| commit | 4253591352ae5187824ca71d6fd034030c2f2146 (patch) | |
| tree | bd2f1916d17e07bf41bcdf57763afd07553df72e | |
| parent | 05a4ad6994919b352b5229d0b1b0a8ebebe2a42f (diff) | |
2003-01-28 Havoc Pennington <hp@pobox.com>
* test/Makefile.am (dist-hook): fix make distdir
* dbus/Makefile.am (TESTS_ENVIRONMENT): fix make check
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 16 |
3 files changed, 15 insertions, 9 deletions
@@ -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 3f6bb63f..322f86a7 100644 --- 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 f0118ee6..a2139166 100644 --- 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 |