diff options
| author | Werner Lemberg <wl@gnu.org> | 2001-04-10 13:59:58 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2001-04-10 13:59:58 +0000 |
| commit | 66aab3c57d5ad038848c25f4785fe9a77979fb6b (patch) | |
| tree | 05ee88468d0141fe6e72e8fd5a63f990f318a8d0 /builds | |
| parent | 0bb24e74b065339c1089bf23f014cca1188c2eba (diff) | |
| download | freetype2-66aab3c57d5ad038848c25f4785fe9a77979fb6b.tar.gz | |
* src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value.
* builds/dos/detect.mk: Add support for bash.
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/dos/detect.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 65eb42d36..a325b9925 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -40,7 +40,7 @@ ifeq ($(PLATFORM),ansi) # substring `MDOS\COMMAND' # ifeq ($(is_dos),) - is_dos := $(findstring MDOS\COMMAND,$(COMSPEC)) + is_dos := $(findstring MDOS\COMMAND,$(COMSPEC)) endif endif # test COMSPEC @@ -53,8 +53,6 @@ ifeq ($(PLATFORM),ansi) endif # test PLATFORM ansi ifeq ($(PLATFORM),dos) - DELETE := del - COPY := copy # Use DJGPP (i.e. gcc) by default. # @@ -98,7 +96,15 @@ ifeq ($(PLATFORM),dos) .PHONY: borlandc endif - setup: dos_setup + ifneq ($(findstring bash,$(SHELL)),) # check for bash + DELETE := rm + COPY := cp + setup: std_setup + else + DELETE := del + COPY := copy + setup: dos_setup + endif endif # test PLATFORM dos |