[Cpri-develop] cpri/misc makefile.mgw,1.7,1.8 makefile.vc,1.10,1.11

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cpri/cpri/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15095

Modified Files:
	makefile.mgw makefile.vc 
Log Message:
Fixed reading of $(SystemRoot) and $(SYSTEMROOT)

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.vc	8 Feb 2004 11:35:56 -0000	1.10
--- makefile.vc	23 May 2004 20:54:27 -0000	1.11
***************
*** 68,86 ****
  
  ifeq ($(OS),Windows_NT)
!  # true 32 bit OS:
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(SYSTEMROOT)
!  else
!   WINSYSDIR = $(SystemRoot)
!  endif
!  WINSUBDIR = system32
  else
!  # DOS based windows:
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(WINDIR)
!  else
!   WINSYSDIR = $(windir)
!  endif
!  WINSUBDIR = system
  endif
  
--- 68,82 ----
  
  ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
  else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
  endif
  

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.mgw	8 Feb 2004 11:35:56 -0000	1.7
--- makefile.mgw	23 May 2004 20:54:27 -0000	1.8
***************
*** 57,76 ****
  .PHONY: badwin badming
  
! ifeq ($(OS),Windows_NT) # true 32 bit OS:
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(SYSTEMROOT)
!  else
!   WINSYSDIR = $(SystemRoot)
!  endif
!  WINSUBDIR = system32
! else # DOS based windows:
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(WINDIR)
!  else
!   WINSYSDIR = $(windir)
!  endif
!  WINSUBDIR = system
  endif
  
  ifneq ($(WINSYSDIR),)
   WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR))
--- 57,75 ----
  .PHONY: badwin badming
  
! ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
! else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
  endif
  
+ 
  ifneq ($(WINSYSDIR),)
   WINDIR_U = $(subst \,/,$(WINSYSDIR)/$(WINSUBDIR))