Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13125
Modified Files:
makefile.mgw makefile.vc
Log Message:
Fixed reading of $(SystemRoot) and $(SYSTEMROOT)
Index: makefile.vc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.vc 28 Feb 2004 00:08:19 -0000 1.7
--- makefile.vc 23 May 2004 20:45:05 -0000 1.8
***************
*** 67,85 ****
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
--- 67,81 ----
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/cbar/cbar/misc/makefile.mgw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.mgw 8 Feb 2004 11:34:11 -0000 1.5
--- makefile.mgw 23 May 2004 20:45:05 -0000 1.6
***************
*** 58,75 ****
.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
--- 58,73 ----
.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
|
