[Cpri-develop] cpri/misc makefile.dj,1.6,1.7 makefile.mgw,1.8,1.9
Brought to you by:
chrisan,
rasmusmyklebust
|
From: Rasmus M. <ras...@us...> - 2004-05-24 00:28:02
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29376 Modified Files: makefile.dj makefile.mgw Log Message: Fixed the use of UNIX_TOOLS if present Index: makefile.mgw =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.mgw 23 May 2004 20:54:27 -0000 1.8 --- makefile.mgw 24 May 2004 00:27:52 -0000 1.9 *************** *** 97,100 **** --- 97,113 ---- 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 ifdef UNIX_TOOLS *************** *** 282,299 **** ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! copy $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! copy $(subst /,\,$< $@) --- 295,312 ---- ifndef STATICLINK $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME) ! $(CP) $(subst /,\,$< $@) endif $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) ! $(CP) $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) Index: makefile.dj =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.dj 8 Feb 2004 11:35:56 -0000 1.6 --- makefile.dj 24 May 2004 00:27:52 -0000 1.7 *************** *** 75,78 **** --- 75,91 ---- 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 ifdef UNIX_TOOLS *************** *** 205,221 **** $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! copy $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! md $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! copy $(subst /,\,$< $@) $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! copy $(subst /,\,$< $@) install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir --- 218,234 ---- $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME) ! $(CP) $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri.h: include/cpri.h ! $(CP) $(subst /,\,$< $@) $(SYSTEM_INCLUDE_DIR)/cpri: ! $(MKDIR) $(subst /,\,$@) $(SYSTEM_INCLUDE_DIR)/cpri/%.h: include/cpri/%.h include/cpri ! $(CP) $(subst /,\,$< $@) $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX) ! $(CP) $(subst /,\,$< $@) install-info $(subst /,\,$@) $(SYSTEM_INFO_DIR)/dir |