DEVEL15-windows-viced-cbd-20060624

don't break platforms other than Windows

(cherry picked from commit 830756f8f73e1f67da6ec916cdfc3e4b9a677f71)

diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index 3c13bafd9aeeba8ce9b020e5859ebd5065d68acb..2818389679c468eacfca865b95af1ff4ebdb4ea9 100644 (file)
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -68,8 +68,8 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
 # Build cbd - not generally distributed debugging program
 CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe
 
-$(OUT)\cbd.obj: callback.c
-       $(C2OBJ) $** -DINTERPRET_DUMP
+$(OUT)\cbd.obj: callback.c AFS_component_version_number.h
+       $(C2OBJ) callback.c -DINTERPRET_DUMP
 
 $(CBD): $(OUT)\cbd.obj 
        $(EXECONLINK)

diff --git a/src/viced/callback.c b/src/viced/callback.c
index a43edbd12dedcd8827e358974de002d2dcc2d097..c7f616e244a491ee5d866f7e49c1c05e18d11cd1 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -2723,7 +2723,11 @@ ReadDump(char *file)
     return now;
 }
 
+#ifdef AFS_NT40_ENV
 #include "AFS_component_version_number.h"
+#else
+#include "AFS_component_version_number.c"
+#endif
 
 int
 main(int argc, char **argv)