--- test/Makefile.in.orig	Mon Mar 10 21:24:30 2003
+++ test/Makefile.in	Thu May  6 16:39:50 2004
@@ -73,10 +73,10 @@
 
 EXTRA_DIST = slp_debug.h 
 
-TESTS = SLPOpen/test.script SLPFindSrvTypes/test.script          SLPFindSrvs/test.script SLPReg/test.script               SLPDereg/test.script SLPFindAttrs/test.script            SLPParseSrvURL/test.script SLPEscape/test.script         SLPUnescape/test.script 
+TESTS = SLPOpen.dir/test.script SLPFindSrvTypes.dir/test.script          SLPFindSrvs.dir/test.script SLPReg.dir/test.script               SLPDereg.dir/test.script SLPFindAttrs.dir/test.script            SLPParseSrvURL.dir/test.script SLPEscape.dir/test.script         SLPUnescape.dir/test.script 
 
 
-XFAIL_TESTS = SLPFindAttrs/test.script
+XFAIL_TESTS = SLPFindAttrs.dir/test.script
 
 INCLUDES = -I$(top_srcdir)/libslp -I$(top_srcdir)/libslpattr            -I$(top_srcdir)/common -I$(top_srcdir)/slpd
 
@@ -95,7 +95,7 @@
 # Automake 1.4 doesn't allow subdirectory dependencies :-(, VPATH is a 
 # kludge to get around that. It's either this or a makefile for each test.
 
-VPATH = $(srcdir):$(srcdir)/SLPDereg:$(srcdir)/SLPEscape:$(srcdir)/SLPFindAttrs:$(srcdir)/SLPFindSrvTypes:$(srcdir)/SLPFindSrvs:$(srcdir)/SLPOpen:$(srcdir)/SLPParseSrvURL:$(srcdir)/SLPReg:$(srcdir)/SLPUnescape:$(srcdir)/SLP_attr_test:$(srcdir)/SLPD_predicate_test
+VPATH = $(srcdir):$(srcdir)/SLPDereg.dir:$(srcdir)/SLPEscape.dir:$(srcdir)/SLPFindAttrs.dir:$(srcdir)/SLPFindSrvTypes.dir:$(srcdir)/SLPFindSrvs.dir:$(srcdir)/SLPOpen.dir:$(srcdir)/SLPParseSrvURL.dir:$(srcdir)/SLPReg.dir:$(srcdir)/SLPUnescape.dir:$(srcdir)/SLP_attr_test.dir:$(srcdir)/SLPD_predicate_test.dir
 
 # Program names are in lower case because they conflict with directory names
 slpdereg_SOURCES = SLPDereg.c
@@ -333,23 +333,23 @@
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-SLPDereg.o: ./SLPDereg/SLPDereg.c ../libslp/slp.h slp_debug.h
-SLPEscape.o: ./SLPEscape/SLPEscape.c ../libslp/slp.h slp_debug.h
-SLPFindAttrs.o: ./SLPFindAttrs/SLPFindAttrs.c ../libslp/slp.h \
+SLPDereg.o: ./SLPDereg.dir/SLPDereg.c ../libslp/slp.h slp_debug.h
+SLPEscape.o: ./SLPEscape.dir/SLPEscape.c ../libslp/slp.h slp_debug.h
+SLPFindAttrs.o: ./SLPFindAttrs.dir/SLPFindAttrs.c ../libslp/slp.h \
 	slp_debug.h
-SLPFindSrvTypes.o: ./SLPFindSrvTypes/SLPFindSrvTypes.c ../libslp/slp.h \
+SLPFindSrvTypes.o: ./SLPFindSrvTypes.dir/SLPFindSrvTypes.c ../libslp/slp.h \
 	slp_debug.h
-SLPFindSrvs.o: ./SLPFindSrvs/SLPFindSrvs.c ../libslp/slp.h slp_debug.h
-SLPOpen.o: ./SLPOpen/SLPOpen.c ../libslp/slp.h slp_debug.h
-SLPParseSrvURL.o: ./SLPParseSrvURL/SLPParseSrvURL.c ../libslp/slp.h \
+SLPFindSrvs.o: ./SLPFindSrvs.dir/SLPFindSrvs.c ../libslp/slp.h slp_debug.h
+SLPOpen.o: ./SLPOpen.dir/SLPOpen.c ../libslp/slp.h slp_debug.h
+SLPParseSrvURL.o: ./SLPParseSrvURL.dir/SLPParseSrvURL.c ../libslp/slp.h \
 	slp_debug.h
-SLPReg.o: ./SLPReg/SLPReg.c ../libslp/slp.h slp_debug.h
-SLPUnescape.o: ./SLPUnescape/SLPUnescape.c ../libslp/slp.h slp_debug.h
-slp_attr_test.o: ./SLP_attr_test/slp_attr_test.c ../libslp/slp.h \
+SLPReg.o: ./SLPReg.dir/SLPReg.c ../libslp/slp.h slp_debug.h
+SLPUnescape.o: ./SLPUnescape.dir/SLPUnescape.c ../libslp/slp.h slp_debug.h
+slp_attr_test.o: ./SLP_attr_test.dir/slp_attr_test.c ../libslp/slp.h \
 	../libslpattr/libslpattr.h \
 	../libslpattr/../common/slp_compare.h \
 	../libslpattr/../libslp/slp.h
-slpd_predicate_test.o: ./SLPD_predicate_test/slpd_predicate_test.c \
+slpd_predicate_test.o: ./SLPD_predicate_test.dir/slpd_predicate_test.c \
 	../libslpattr/libslpattr.h \
 	../libslpattr/../common/slp_compare.h \
 	../libslpattr/../libslp/slp.h
@@ -458,16 +458,16 @@
 # Remove all lines from VPATH (inclusive) to this line and uncomment
 # the following lines when Automake 1.5 is released
 #
-# slpdereg_SOURCES = SLPDereg/SLPDereg.c
-# slpescape_SOURCES = SLPEscape/SLPEscape.c
-# slpfindattrs_SOURCES = SLPFindAttrs/SLPFindAttrs.c
-# slpfindsrvs_SOURCES = SLPFindSrvs/SLPFindSrvs.c
-# slpfindsrvtypes_SOURCES = SLPFindSrvTypes/SLPFindSrvTypes.c
-# slpopen_SOURCES = SLPOpen/SLPOpen.c
-# slpparsesrvurl_SOURCES = SLPParseSrvURL/SLPParseSrvURL.c
-# slpreg_SOURCES = SLPReg/SLPReg.c
-# slpunescape_SOURCES = SLPUnescape/SLPUnescape.c
-# slp_attr_test_SOURCES = SLP_attr_test/slp_attr_test.c
+# slpdereg_SOURCES = SLPDereg.dir/SLPDereg.c
+# slpescape_SOURCES = SLPEscape.dir/SLPEscape.c
+# slpfindattrs_SOURCES = SLPFindAttrs.dir/SLPFindAttrs.c
+# slpfindsrvs_SOURCES = SLPFindSrvs.dir/SLPFindSrvs.c
+# slpfindsrvtypes_SOURCES = SLPFindSrvTypes.dir/SLPFindSrvTypes.c
+# slpopen_SOURCES = SLPOpen.dir/SLPOpen.c
+# slpparsesrvurl_SOURCES = SLPParseSrvURL.dir/SLPParseSrvURL.c
+# slpreg_SOURCES = SLPReg.dir/SLPReg.c
+# slpunescape_SOURCES = SLPUnescape.dir/SLPUnescape.c
+# slp_attr_test_SOURCES = SLP_attr_test.dir/slp_attr_test.c
 
 clean-local:
 	-rm -f *.output