test-updates-20080331

[openafs.git] / src / tests / Makefile.in

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 13639e5..03ebb18 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -339,7 +339,7 @@ install:
 
 uninstall:
 
-all: run-tests dirpath.conf OpenAFS/Dirpath.pm libxfiles.a libdumpscan.a $(TEST_PROGRAMS)\
+all: run-tests OpenAFS/Dirpath.pm libxfiles.a libdumpscan.a $(TEST_PROGRAMS)\
        afsdump_scan afsdump_dirlist afsdump_extract dumptool
        @chmod +x run-tests
 
@@ -358,25 +358,9 @@ check: run-tests $(TEST_PROGRAMS)
 check-fast: run-tests $(TEST_PROGRAMS)
        ./run-tests -all -fast
 
-dirpath.conf: Makefile
-       @echo "creating $@"
-       @echo "# auto-generated by src/tests/Makefile"      >$@
-       @echo "# DO NOT EDIT"                               >>$@
-       @echo "afsconfdir=@afsconfdir@"                     >>$@
-       @echo "viceetcdir=@viceetcdir@"                     >>$@
-       @echo "afssrvbindir=@afssrvbindir@"                 >>$@
-       @echo "afssrvsbindir=@afssrvsbindir@"               >>$@
-       @echo "afssrvlibexecdir=@afssrvlibexecdir@"         >>$@
-       @echo "afsdbdir=@afsdbdir@"                         >>$@
-       @echo "afslogsdir=@afslogsdir@"                     >>$@
-       @echo "afslocaldir=@afslocaldir@"                   >>$@
-       @echo "afsbackupdir=@afsbackupdir@"                 >>$@
-       @echo "afsbosconfigdir=@afsbosconfigdir@"           >>$@
-       @echo "afskerneldir=@afskerneldir@"                 >>$@
-       @echo "initdir=@sysconfdir@"                        >>$@
-       @echo "localstatedir=@localstatedir@"               >>$@
-       @echo "ostype=@MKAFS_OSTYPE@"                       >>$@
-
+# Note: The autoconf variables are not fully expanded
+#       until make is run so we resort to creating the
+#       configuration at make time.
 OpenAFS/Dirpath.pm: Makefile
        @echo "Creating OpenAFS/Dirpath.pm"
        @echo "# This is -*- perl -*-"                          >$@
@@ -400,12 +384,25 @@ OpenAFS/Dirpath.pm: Makefile
        @echo "  'afslocaldir'      => '@afslocaldir@',"        >>$@
        @echo "  'afsbackupdir'     => '@afsbackupdir@',"       >>$@
        @echo "  'afsbosconfigdir'  => '@afsbosconfigdir@',"    >>$@
-       @echo "  'afskerneldir'     => '@afskerneldir@',"       >>$@
-       @echo "  'initdir'          => '@sysconfdir@',"         >>$@
-       @echo "  'localstatedir'    => '@localstatedir@',"      >>$@
        @echo "  'ostype'           => '@MKAFS_OSTYPE@',"       >>$@
+       @if test "@afsconfdir@" = "/usr/afs/etc" ; then \
+               echo "  # transarc paths" ;\
+               echo "  'cachedir'     => '/usr/vice/cache'," ;\
+               echo "  'afsddir'      => '/usr/vice/etc'," ;\
+               echo "  'initdir'      => '/usr/vice/etc',"  ;\
+               echo "  'afskerneldir' => '/usr/vice/etc/modload'," ;\
+               echo "  'afswsbindir'  => '/usr/afsws/bin'," ;\
+       else \
+               echo "  # modern paths" ;\
+               echo "  'cachedir'     => '@localstatedir@/openafs/cache'," ;\
+               echo "  'afsddir'      => '@afssrvsbindir@'," ;\
+               echo "  'initdir'      => '@sysconfdir@',"  ;\
+               echo "  'afskerneldir' => '@afskerneldir@'," ;\
+               echo "  'afswsbindir'  => '@afssrvbindir@'," ;\
+       fi >>$@
        @echo "};"                                              >>$@
        @echo ""                                                >>$@
        @echo "1;"                                              >>$@
 
+
 .PHONY:                all install clean realclean distclean mostlyclean install uninstall check