[Cgui-develop] cgui/misc makefile.dj,1.1.1.1.2.2,1.1.1.1.2.3 makefile.mgw,1.1.1.1.2.3,1.1.1.1.2.4

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

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

Modified Files:
      Tag: Branch_CGUI_1-6-4
	makefile.dj makefile.mgw 
Log Message:
Fixed the use of UNIX_TOOLS if present

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.mgw,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** makefile.mgw	23 May 2004 15:59:16 -0000	1.1.1.1.2.3
--- makefile.mgw	24 May 2004 00:24:35 -0000	1.1.1.1.2.4
***************
*** 107,111 ****
--- 107,123 ----
  SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib
  
+ ifneq (,$(findstring /sh.exe,$(SHELL)))
+   UNIX_TOOLS = 1
+ endif
  
+ ifdef UNIX_TOOLS
+   CP = cp
+   RM = rm
+   MKDIR = mkdir
+ else
+   CP = copy
+   RM = del
+   MKDIR = md
+ endif
  
  # -------- Set up mktext --------
***************
*** 393,410 ****
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	copy $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui.h: include/cgui.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui/%.h: include/cgui/%.h include/cgui
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 405,422 ----
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	$(CP) $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui.h: include/cgui.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui/%.h: include/cgui/%.h include/cgui
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.dj,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** makefile.dj	27 Feb 2004 23:08:11 -0000	1.1.1.1.2.2
--- makefile.dj	24 May 2004 00:24:35 -0000	1.1.1.1.2.3
***************
*** 76,79 ****
--- 76,92 ----
  SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info
  
+ ifneq (,$(findstring /sh.exe,$(SHELL)))
+   UNIX_TOOLS = 1
+ endif
+ 
+ ifdef UNIX_TOOLS
+   CP = cp
+   RM = rm
+   MKDIR = mkdir
+ else
+   CP = copy
+   RM = del
+   MKDIR = md
+ endif
  
  # -------- Set up mktext --------
***************
*** 260,276 ****
  
  $(SYSTEM_INCLUDE_DIR)/cgui.h: include/cgui.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui/%.h: include/cgui/%.h include/cgui
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 273,289 ----
  
  $(SYSTEM_INCLUDE_DIR)/cgui.h: include/cgui.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cgui/%.h: include/cgui/%.h include/cgui
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else