ref: 744dd456bc5d66d3e3cf116f61705b8dda1a09da
parent: 4c93399155e88c415df05a46a14625ebf95c5ddc
author: Werner Lemberg <[email protected]>
date: Mon Feb 11 03:22:40 EST 2008
* 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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-11 Werner Lemberg <[email protected]>
+
+ * 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 <[email protected]>
* src/base/ftlcdfil.c (_ft_lcd_filter_legacy): Updated comment to
--- 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 @@
# 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
--- 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 @@
# 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
--- 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 @@
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)