diff --git a/ChangeLog b/ChangeLog index ba23eceb3..7f7fb16c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-11 Werner Lemberg + + * builds/modules.mk (CLOSE_MODULE, REMOVE_MODULE), builds/detect.mk + (dos_setup), builds/freetype.mk (clean_project_dos, + distclean_project_dos): Don't use \ but $(SEP). Reported by Duncan + Murdoch. + 2008-01-18 Sylvain Pasche * src/base/ftlcdfil.c (_ft_lcd_filter_legacy): Updated comment to diff --git a/builds/detect.mk b/builds/detect.mk index c3632c08a..987ae51c4 100644 --- a/builds/detect.mk +++ b/builds/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2002, 2003, 2006 by +# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -132,23 +132,23 @@ std_setup: # Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly! # dos_setup: - @type builds\newline + @type builds$(SEP)newline @echo $(PROJECT_TITLE) build system -- automatic system detection - @type builds\newline + @type builds$(SEP)newline @echo The following settings are used: - @type builds\newline + @type builds$(SEP)newline @echo platform˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙$(PLATFORM) @echo compiler˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙$(CC) - @echo configuration directory˙˙˙˙˙˙$(subst /,\,$(BUILD_DIR)) - @echo configuration rules˙˙˙˙˙˙˙˙˙˙$(subst /,\,$(CONFIG_RULES)) - @type builds\newline + @echo configuration directory˙˙˙˙˙˙$(subst /,$(SEP),$(BUILD_DIR)) + @echo configuration rules˙˙˙˙˙˙˙˙˙˙$(subst /,$(SEP),$(CONFIG_RULES)) + @type builds$(SEP)newline @echo If this does not correspond to your system or settings please remove the file @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. - @type builds\newline + @type builds$(SEP)newline @echo Otherwise, simply type 'make' again to build the library. @echo or 'make refdoc' to build the API reference (the latter needs python). - @type builds\newline - @$(COPY) $(subst /,\,$(CONFIG_RULES) $(CONFIG_MK)) > nul + @type builds$(SEP)newline + @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul # EOF diff --git a/builds/freetype.mk b/builds/freetype.mk index 9d9c23317..877bda27c 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2002, 2003, 2004, 2005, 2006 by +# Copyright 1996-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -327,10 +327,10 @@ distclean_project_std: clean_project_std # working correctly on Win9x. # clean_project_dos: - -$(DELETE) $(subst /,\,$(OBJ_DIR)/*.$O $(CLEAN) $(NO_OUTPUT)) + -$(DELETE) $(subst /,$(SEP),$(OBJ_DIR)/*.$O $(CLEAN) $(NO_OUTPUT)) distclean_project_dos: clean_project_dos - -$(DELETE) $(subst /,\,$(PROJECT_LIBRARY) $(DISTCLEAN) $(NO_OUTPUT)) + -$(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY) $(DISTCLEAN) $(NO_OUTPUT)) .PHONY: remove_config_mk remove_ftmodule_h diff --git a/builds/modules.mk b/builds/modules.mk index 5f1f9ee94..c4a882cbd 100644 --- a/builds/modules.mk +++ b/builds/modules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2006 by +# Copyright 1996-2000, 2003, 2006, 2008 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -30,8 +30,8 @@ $(FTMODULE_H): $(MODULES_CFG) ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),) OPEN_MODULE := @echo$(space) - CLOSE_MODULE := >> $(subst /,\,$(FTMODULE_H)) - REMOVE_MODULE := @-$(DELETE) $(subst /,\,$(FTMODULE_H)) + CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H)) + REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H)) else OPEN_MODULE := @echo " CLOSE_MODULE := " >> $(FTMODULE_H)