X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fconfig%2FNTMakefile;h=311f97acade68ed738ef5e7f0a1e729ce910063f;hp=917e8cbfee88cf2c75426775f544db540a8bf60d;hb=7abae22b939796acdde6f8e83c0e1ed9f5c9b799;hpb=14e482ad26912a089ff0c365335081f2071f1299

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 917e8cb..311f97a 100644
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -17,14 +17,13 @@ SRCROOT = ..\..\..\src
 !ERROR Can not find src directory from current directory.
 !ENDIF
 
-
-
 INCFILEDIR = $(DESTDIR)\include\afs
 
 INCFILES =\
 	$(INCFILEDIR)\afs_args.h \
 	$(INCFILEDIR)\debug.h \
 	$(INCFILEDIR)\param.h \
+	$(INCFILEDIR)\afsconfig.h \
 	$(INCFILEDIR)\afs_sysnames.h \
 	$(INCFILEDIR)\stds.h \
 	$(INCFILEDIR)\icl.h 
@@ -33,7 +32,13 @@ INCFILES =\
 $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
 	$(COPY) $? $@
 
+$(INCFILEDIR)\afsconfig.h: afsconfig-windows.h
+	$(COPY) $? $@
+
 idirs: doclink
+!	IF (!EXIST($(DESTDIR)))
+		$(MKDIR) $(DESTDIR)
+!	ENDIF
 !	IF (!EXIST($(DESTDIR)\include))
 		$(MKDIR) $(DESTDIR)\include
 !	ENDIF
@@ -64,6 +69,9 @@ idirs: doclink
 !	IF (!EXIST($(DESTDIR)\WinInstall))
 		$(MKDIR) $(DESTDIR)\WinInstall
 !	ENDIF
+!	IF (!EXIST($(DESTDIR)\WinInstall\Config))
+		$(MKDIR) $(DESTDIR)\WinInstall\Config
+!	ENDIF
 !	IF (!EXIST($(DESTDIR)\root.server))
 		$(MKDIR) $(DESTDIR)\root.server
 !	ENDIF
@@ -76,10 +84,42 @@ idirs: doclink
 !	IF (!EXIST($(DESTDIR)\root.server\usr\afs\bin))
 		$(MKDIR) $(DESTDIR)\root.server\usr\afs\bin
 !	ENDIF
+!	IF (!EXIST($(DESTDIR)\root.client))
+		$(MKDIR) $(DESTDIR)\root.client
+!	ENDIF
+!	IF (!EXIST($(DESTDIR)\root.client\usr))
+		$(MKDIR) $(DESTDIR)\root.client\usr
+!	ENDIF
+!	IF (!EXIST($(DESTDIR)\root.client\usr\vice))
+		$(MKDIR) $(DESTDIR)\root.client\usr\vice
+!	ENDIF
 !	IF (!EXIST($(DESTDIR)\root.client\usr\vice\etc))
 		$(MKDIR) $(DESTDIR)\root.client\usr\vice\etc
 !	ENDIF
+	$(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\afsconfig.h
 
+INCCOPY = \
+	$(DESTDIR)\bin\rmbat.bat \
+	$(DESTDIR)\bin\rmbat.rsp \
+	$(DESTDIR)\bin\NTBUILD.bat
+
+$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat
+	$(COPY) $? $@
+	util_cr + $@
+
+$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp
+	$(COPY) $? $@
+
+$(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat
+	$(COPY) $? $@
+	util_cr + $@
+
+$(DESTDIR)\bin\NTLang.bat: NTLang.bat util_cr.exe
+	$(COPY) NTLang.bat $(DESTDIR)\bin
+	util_cr + $(DESTDIR)\bin\NTLang.bat
+
+$(DESTDIR)\NTDllmap.txt:NTDllmap.txt
+	$(COPY) $? $@
 
 # Create link to docs needed for media build; allow to fail in case
 # symlink not available, e.g. if using a 3.4a client, since most builds
@@ -101,24 +141,42 @@ NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML
 		$(COPY) NTMakefile.version-NOCML NTMakefile.version
 !	ENDIF
 
-$(DESTDIR)\bin\mkvers.exe: mkvers.exe
-	$(COPY) mkvers.exe $(DESTDIR)\bin
+INCTOOLS = \
+	$(DESTDIR)\bin\mkvers.exe \
+	$(DESTDIR)\bin\util_cr.exe \
+	$(DESTDIR)\bin\touch.exe
 
+#mkvers.exe : mkvers.obj
+#	$(EXECONLINK)
 
-$(DESTDIR)\NTDllmap.txt: NTDllmap.txt
-	$(COPY) NTDllmap.txt $(DESTDIR)
+$(DESTDIR)\bin\mkvers.exe:mkvers.exe
+	$(COPY) mkvers.exe $(DESTDIR)\bin\.
 
+$(DESTDIR)\bin\util_cr.exe:util_cr.exe
+	$(COPY) util_cr.exe $(DESTDIR)\bin\.
 
-$(DESTDIR)\bin\NTLang.bat: NTLang.bat
-	$(COPY) NTLang.bat $(DESTDIR)\bin
+util_cr.exe : util_cr.obj
+	$(EXECONLINK)
 
-langsetup: $(DESTDIR)\bin\NTLang.bat
+$(DESTDIR)\bin\touch.exe:touch.exe
+	$(COPY) touch.exe $(DESTDIR)\bin\.
 
+langsetup: $(DESTDIR)\bin\NTLang.bat
 
-install: idirs version $(INCFILES) $(DESTDIR)\NTDllmap.txt langsetup
+install: idirs $(INCTOOLS) $(INCCOPY) version $(INCFILES) $(DESTDIR)\NTDllmap.txt langsetup 
 
+install9x: install
 
 # This clean target must be named something different than the universal
 # 'clean' so that the version file can be removed last.
 clean_version:
 	$(DEL) NTMakefile.version
+
+clean::
+	$(DEL) $(DESTDIR)\LIB\*.DLL
+	$(DEL) $(DESTDIR)\bin\mkver.exe
+	$(DEL) $(DESTDIR)\bin\touch.exe
+	$(DEL) $(DESTDIR)\bin\util_cr.exe
+	$(DEL) mkver.exe
+	$(DEL) touch.exe
+	$(DEL) util_cr.exe
\ No newline at end of file