[Ccom-develop] ccom/misc makefile.mgw,1.4,1.5 makefile.vc,1.8,1.9

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

Update of /cvsroot/ccomx/ccom/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14759

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

Index: makefile.vc
===================================================================
RCS file: /cvsroot/ccomx/ccom/misc/makefile.vc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.vc	27 Feb 2004 23:48:23 -0000	1.8
--- makefile.vc	23 May 2004 20:53:02 -0000	1.9
***************
*** 66,82 ****
  
  ifeq ($(OS),Windows_NT)
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(SYSTEMROOT)
!  else
!   WINSYSDIR = $(SystemRoot)
!  endif
!  WINSUBDIR = system32
  else
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(WINDIR)
!  else
!   WINSYSDIR = $(windir)
!  endif
!  WINSUBDIR = system
  endif
  
--- 66,80 ----
  
  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/ccomx/ccom/misc/makefile.mgw,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.mgw	8 Feb 2004 20:47:22 -0000	1.4
--- makefile.mgw	23 May 2004 20:53:01 -0000	1.5
***************
*** 59,75 ****
  
  ifeq ($(OS),Windows_NT)
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(SYSTEMROOT)
!  else
!   WINSYSDIR = $(SystemRoot)
!  endif
!  WINSUBDIR = system32
  else
!  ifeq ($(TERM),msys)
!   WINSYSDIR = $(WINDIR)
!  else
!   WINSYSDIR = $(windir)
!  endif
!  WINSUBDIR = system
  endif
  
--- 59,73 ----
  
  ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
  else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
  endif