From 6f3938e80a79a4a3684565a6960bce18e167aea4 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 21 Oct 2010 14:09:53 -0400 Subject: [PATCH] Windows: Fix i386_w2k and i386_nt40 path construction Now that DEST and OBJ are defined in terms of AFSROOT do not DESTDIR and OJT in terms of AFSROOT. Change-Id: I196b4d0c93d2122c0b29f423213871db788c5ef5 Reviewed-on: http://gerrit.openafs.org/3025 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/config/NTMakefile.i386_nt40 | 6 +++--- src/config/NTMakefile.i386_w2k | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 42e6ecd91..a8e6e0c9d 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -122,11 +122,11 @@ DOC=$(AFSROOT)\doc !IF ("$(AFS_OBJDIR)"=="") ######### AFS_OBJDIR is NOT used use default locations ! IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") -DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked -OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked +DESTDIR=$(DEST)\$(SYS_NAME)\checked +OJT=$(OBJ)\$(SYS_NAME)\checked ! ELSE DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free -OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free +OJT=$(OBJ)\$(SYS_NAME)\free ! ENDIF UTIL_CR = $(DESTDIR)\bin\util_cr.exe !ELSE diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index b5cb9038c..c8c801c22 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -126,11 +126,11 @@ DOC=$(AFSROOT)\doc !IF ("$(AFS_OBJDIR)"=="") ######### AFS_OBJDIR is NOT used use default locations ! IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") -DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked -OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked +DESTDIR=$(DEST)\$(SYS_NAME)\checked +OJT=$(OBJ)\$(SYS_NAME)\checked ! ELSE -DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free -OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free +DESTDIR=$(DEST)\$(SYS_NAME)\free +OJT=$(OBJ)\$(SYS_NAME)\free ! ENDIF UTIL_CR = $(DESTDIR)\bin\util_cr.exe !ELSE -- 2.39.5