Windows: Version number update for 1.5.69

[openafs.git] / src / config / NTMakefile.i386_nt40

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 6a10fd3..21d540b 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -82,15 +82,25 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
+!IF !DEFINED(AFSPRODUCT_VER_MAJOR)
 AFSPRODUCT_VER_MAJOR=1
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_MINOR)
 AFSPRODUCT_VER_MINOR=5
-AFSPRODUCT_VER_PATCH=0000
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_PATCH)
+AFSPRODUCT_VER_PATCH=6900
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
+!ENDIF
 
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 # Set CELLNAME_DEFAULT to "your cell name"
+!IF !DEFINED(CELLNAME_DEFAULT)
 CELLNAME_DEFAULT=openafs.org
+!ENDIF
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
 TARGETOS = WINNT
@@ -103,11 +113,11 @@ OBJ=obj
 !IF ("$(AFS_OBJDIR)"=="") 
 #########  AFS_OBJDIR is NOT used use default locations
 !  IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(DEST)\checked
-OJT=$(AFSROOT)\$(OBJ)\checked
+DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked
 !  ELSE
-DESTDIR=$(AFSROOT)\$(DEST)\free
-OJT=$(AFSROOT)\$(OBJ)\free
+DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free
+OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free
 !  ENDIF
 UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !ELSE
@@ -116,21 +126,21 @@ UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !  IF (EXIST($(AFSROOT)\$(AFS_OBJDIR)))
 #  AFS_OBJDIR is relative path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\checked
-OJT=$(AFSROOT)\$(AFS_OBJDIR)\checked\config
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !    ELSE
-OJT=$(AFSROOT)\$(AFS_OBJDIR)\free\config
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\free
+OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\free\config
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
 !    ENDIF
 !  ELSE
 !    IF (EXIST($(AFS_OBJDIR)))
 #   AFS_OBJDIR is full path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\checked
-OJT=$(AFS_OBJDIR)\checked\config
+DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !      ELSE
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\free
-OJT=$(AFS_OBJDIR)\free\config
+DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+OJT=$(AFS_OBJDIR)\$(SYS_NAME)\free\config
 !      ENDIF
 !    ELSE
 !ERROR Can't find location of DEST directory!
@@ -183,18 +193,36 @@ APPVER=5.0
 # Extend and/or supplement definitions in WIN32.MAK.
 
 # Command macros.
+!IF !DEFINED(COPY)
 COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
 DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
 REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
 ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
 CD = cd
+!ENDIF
+!IF !DEFINED(MC)
 MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL  = midl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
-MIDL  = midl
 
 # Common clean target.
 clean::
@@ -218,7 +246,6 @@ afscdefs =\
        -D_WIN32_WINNT=0x0500 \
        -DWINVER=0x0500 \
        -DREGISTER_POWER_NOTIFICATIONS \
-       -DAFS_AFSDB_ENV \
        -DAFS_FREELANCE_CLIENT \
        -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
@@ -455,3 +482,13 @@ AFSDEV_AUXMIDLFLAGS=$(AFSDEV_AUXMIDLFLAGS) /Oi
 LEX = flex -l
 YACC = bison
 
+######### Create Cygwin .a files
+# This macro should be invoked as a build step for a DLL target.
+!IFNDEF NOCYGWIN
+MAKECYGLIB=\
+       for %%C in (as.exe) do \
+       if exist %%~$$PATH:C \
+       dlltool --dllname $(@B).dll --output-lib $(@R).a --temp-prefix $(OUT) -S %%~$$PATH:C
+!ELSE
+MAKECYGLIB=echo Skipping Cygwin archive
+!ENDIF