winnt-makefile-fixes-20010908

clean up makefile problems which got introduced by other changes

diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c
index 5961ebe52609d052bbaa84716b31edb38bbfa200..f7e3284c09a78ff9a74279e8af4f159050d45b37 100644 (file)
--- a/src/WINNT/afsd/cm_utils.c
+++ b/src/WINNT/afsd/cm_utils.c
@@ -129,7 +129,7 @@ cm_space_t *cm_GetSpace(void)
                cm_spaceListp = tsp->nextp;
         }
         else tsp = (cm_space_t *) malloc(sizeof(cm_space_t));
-       (void) memset(tsp, 0, sizeof(cm_space_t);
+       (void) memset(tsp, 0, sizeof(cm_space_t));
         lock_ReleaseWrite(&cm_utilsLock);
         
         return tsp;

diff --git a/src/WINNT/pthread/NTMakefile b/src/WINNT/pthread/NTMakefile
index fc2aa88f0cf296c08475b404b3b26e958f45df68..d2beadb3344993def7a012b87bc2125222fb67f6 100644 (file)
--- a/src/WINNT/pthread/NTMakefile
+++ b/src/WINNT/pthread/NTMakefile
@@ -45,8 +45,8 @@ pthread_95.obj: pthread.c
        $(C2OBJ) pthread.c -DAFS_WIN95_ENV /Fopthread_95.obj
 
 install: $(PTHR95_DLLFILE) $(PTHR_DLLFILE) $(LIBINCLUDES)
-\r
-install9x: install\r
+
+install9x: install
 
 pthread.res: pthread.rc AFS_component_version_number.h
        $(RC) $*.rc

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 6848183f0bb0b4a47bbbc1e3e87fbaf82c1db800..15afcf44c81340e2cad0a067a7ab124ae254bdd0 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -93,7 +93,7 @@ include ..\config\NTMakefile.version
 # nmake /nologo /f ntmakefile install
 #----------------------------------------------- BUTC
 
-$(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)\r
+$(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)
        $(EXECONLINK)
        $(EXEPREP)
 

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 04fde9ecdfaacc8bb1aea6817ee090575e7f5620..174691f291e604be64443f8c8d3269411b8ef5e2 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -29,6 +29,9 @@ INCFILES =\
 $(DESTDIR)\include\afs\dirent.h: dirent_nt.h
        $(COPY) $** $@
 
+$(DESTDIR)\include\afs\dirpath.h: dirpath.hin
+       $(COPY) $** $@
+
 LIBFILE = $(DESTDIR)\lib\afs\afsutil.lib
 
 LIBOBJS = \

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 9eabd31eafec3e203c156a683a8d8aaa080ed8fa..1bb27b307fb7953a9c2bc6a90142572dad9c7e9e 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -158,7 +158,7 @@ static void initDirPathArray(void)
 
     /* setup top level dirpath (/usr equivalent); valid for server ONLY */
     strcpy(dirPathArray[AFSDIR_USR_DIRPATH_ID], ntServerInstallDirShort);
-    serverPrefix = ntInstallDirShort;
+    serverPrefix = ntServerInstallDirShort;
     strcat(dirPathArray[AFSDIR_USR_DIRPATH_ID], AFSDIR_CANONICAL_USR_DIRPATH);
 
 #else /* AFS_NT40_ENV */