(no subject)

[Daniel Reed]

make[2]: Entering directory `/home/dev/dbus-build/test'
rm -rf .libs _libs
if test ../../dbus-current/test != . ; then                                     \
        FILES=`(cd ../test && find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service")` ;    \
        for F in $FILES; do                                     \
                DEST=../test/$F ;                       \
                echo '-- Deleting test file '$F ;               \
                rm $DEST || exit 1 ;                            \
        done ;                                                  \
        REVERSEDIRS= ;                                          \
        for D in data data/valid-messages data/invalid-messages data/incomplete-messages data/auth data/sha-1 data/valid-config-files data/valid-config-files/basic.d data/valid-config-files/system.d data/valid-service-files data/invalid-config-files data/equiv-config-files data/equiv-config-files/basic data/equiv-config-files/basic/basic.d data/equiv-config-files/entities data/equiv-config-files/entities/basic.d; do                             \
                REVERSEDIRS="$D $REVERSEDIRS" ;         \
        done ;                                                  \
        for D in $REVERSEDIRS; do                               \
                rmdir ../test/$D || exit 1 ;                    \
        done ;                                                  \
fi
make[2]: *** [clean-local] Error 1
make[2]: Leaving directory `/home/dev/dbus-build/test'
make[1]: *** [clean-recursive] Error 1
make[1]: Leaving directory `/home/dev/dbus-build/test'
make: *** [clean-recursive] Error 1


The directories only need to be deleted if they actually exist; checking
for error catches unable-to-delete problems as well as directory-does-not-
exist errors.

-- 
Daniel Reed <n at ml.org>	http://naim-users.org/nmlorg/	http://naim.n.ml.org/
There go my people. I must find out where they are going so I can lead
them. -- Alexandre Ledru-Rollin
-------------- next part --------------
make[2]: Entering directory `/home/dev/dbus-build/test'
rm -rf .libs _libs
if test ../../dbus-current/test != . ; then                                     \
        FILES=`(cd ../test && find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service")` ;    \
        for F in $FILES; do                                     \
                DEST=../test/$F ;                       \
                echo '-- Deleting test file '$F ;               \
                rm $DEST || exit 1 ;                            \
        done ;                                                  \
        REVERSEDIRS= ;                                          \
        for D in data data/valid-messages data/invalid-messages data/incomplete-messages data/auth data/sha-1 data/valid-config-files data/valid-config-files/basic.d data/valid-config-files/system.d data/valid-service-files data/invalid-config-files data/equiv-config-files data/equiv-config-files/basic data/equiv-config-files/basic/basic.d data/equiv-config-files/entities data/equiv-config-files/entities/basic.d; do                             \
                REVERSEDIRS="$D $REVERSEDIRS" ;         \
        done ;                                                  \
        for D in $REVERSEDIRS; do                               \
                test -d ../test/$D && rmdir ../test/$D || exit 1 ;      \
        done ;                                                  \
fi
make[2]: *** [clean-local] Error 1
make[2]: Leaving directory `/home/dev/dbus-build/test'
make[1]: *** [clean-recursive] Error 1
make[1]: Leaving directory `/home/dev/dbus-build/test'
make: *** [clean-recursive] Error 1


Index: test/Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- test/Makefile.am	15 Jan 2005 07:15:38 -0000	1.35
+++ test/Makefile.am	24 Mar 2005 06:14:25 -0000
@@ -124,6 +124,6 @@
 			REVERSEDIRS="$$D $$REVERSEDIRS" ;		\
 		done ;							\
 		for D in $$REVERSEDIRS; do				\
-			rmdir $(top_builddir)/test/$$D || exit 1 ;	\
+			test -d $(top_builddir)/test/$$D && (rmdir $(top_builddir)/test/$$D || exit 1) || true ;	\
 		done ;							\
 	fi