From 7d53e9694247b34f6a462390a5ecb2b82c0b26c6 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. Reviewed-on: http://gerrit.openafs.org/3025 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 6f3938e80a79a4a3684565a6960bce18e167aea4) Change-Id: I4f084faaa5e058bb16045552135c70ac0a1683d3 Reviewed-on: http://gerrit.openafs.org/3122 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- 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 ed8dfd111..9935392e9 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -113,11 +113,11 @@ OBJ=obj !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 0ce3e40a9..fb0cea5df 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -117,11 +117,11 @@ OBJ=obj !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