1360-version-20040317

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

diff --git a/src/config/NTMakefile.i386_win95 b/src/config/NTMakefile.i386_win95
index a5b801b..9b81d2c 100644 (file)
--- a/src/config/NTMakefile.i386_win95
+++ b/src/config/NTMakefile.i386_win95
@@ -11,7 +11,6 @@
 #     AFSDEV_BUILDTYPE = [ CHECKED | FREE ]
 #     AFSDEV_INCLUDE = <default include directories>
 #     AFSDEV_LIB = <default library directories>
-#     AFSDEV_BIN = <default build binary directories>
 #
 # Optional definitions:
 #     AFSDEV_DESTDIR = <top-level install directory>  (default is $(AFSROOT)\DEST)
@@ -36,6 +35,12 @@
 APPVER = 4.0
 !ENDIF
 
+#define used in Win9x installation and program version display
+AFSPRODUCT_VERSION=1.3.60
+CELLNAME_DEFAULT=Your Cell Name
+CELLSERVDB_INSTALL=CellServDB.GrandCentral
+CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
+
 !IFNDEF TARGETOS
 TARGETOS = WIN95
 #TARGETOS = WINNT
@@ -88,20 +93,6 @@ INCLUDE = $(AFSDEV_INCLUDE)
 !ENDIF
 LIB = $(AFSDEV_LIB)
 
-
-# Put default build binary directories at front of path.
-
-!IFNDEF AFSDEV_BIN
-!ERROR Must define AFSDEV_BIN to be the default build binary directories.
-!ENDIF
-
-!IF ((!DEFINED(PATH)) && ([set PATH=$(AFSDEV_BIN)] != 0))
-#    If env. var. PATH not defined then macro assignment won't set it.
-!ERROR Failed setting environment variable PATH.
-!ENDIF
-PATH = $(AFSDEV_BIN);$(PATH)
-
-
 # Undefine WIN32.MAK NODEBUG macro.
 # Always generate full debug info, unless profiling or tuning (see below).
 
@@ -124,7 +115,7 @@ DESTDIR = $(AFSROOT)\DEST
 COPY = copy
 #DEL = del
 #DEL = rm -f       # to delete multiple files on one command line
-DEL = $(AFSROOT)\src\rmbat        # win 98 must use batch file
+DEL = $(DESTDIR)\BIN\rmbat        # win 98 must use batch file
 MKDIR = mkdir
 REN = ren
 ECHO = echo
@@ -158,7 +149,9 @@ afscdefs =\
        -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
-       -D_WIN32_IE=0x0400
+       -D_WIN32_IE=0x0400 \
+     -DAFS_AFSDB_ENV \
+     -DAFS_FREELANCE_CLIENT
 
 !      IF ((EXIST($(MSSDK)\include)) && (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" )))
 afscdefs=$(afscdefs) -I$(MSSDK)\include $(afscppdefs) \
@@ -294,7 +287,8 @@ DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll) $
 DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $**
 
 # DLL link macro for resource-only DLLs
-DLLRESLINK = $(link) /OUT:$@ $(dlllflags:-entry:_DllMainCRTStartup@12=-noentry) $(afslflags) $**
+# DLLRESLINK = $(link) /OUT:$@ $(dlllflags:-entry:_DllMainCRTStartup@12=-noentry) $(afslflags) $**
+DLLRESLINK = $(link) /OUT:$@ -noentry $(afslflags) $**
 
 # Library archive macro
 LIBARCH = $(implib) /NOLOGO /OUT:$@ $**
@@ -319,7 +313,7 @@ C2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c
 CPP2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) $(afscppdefs) /c
 
 # Resource compiler macro
-RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS)
+RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(AFSPRODUCT_VERSION)\""
 
 # Lex/Yacc macros
 LEX = flex -l