Commit 29179a33ee27f33874e009e67a6550570b0cf6b1
2001-03-04T22:10:36
* builds/unix/detect.mk: Add test for Hurd. * builds/hurd/detect.mk: Removed.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
diff --git a/ChangeLog b/ChangeLog
index c4139ee..cc8f354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
* src/pcf/pcfutil.c (BitOrderInvert): Add `const'.
* docs/glnames.py: Updated to latest pstables.h changes.
+ * builds/unix/detect.mk: Add test for Hurd.
+ * builds/hurd/detect.mk: Removed.
+
2001-03-04 Sander van der Wal <svdwal@xs4all.nl>
* src/psnames/pstables.h: Add more `const'.
diff --git a/builds/hurd/detect.mk b/builds/hurd/detect.mk
deleted file mode 100644
index 188fb22..0000000
--- a/builds/hurd/detect.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1996-2000 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT. By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-#
-# This file is used to compile FreeType on the GNU Hurd operating system
-# the _only_ difference with builds/unix/detect.mk is that we look for
-# a file named "/hurd/auth" instead of "/sbin/init"
-#
-
-.PHONY: devel lcc setup unix
-
-ifeq ($(PLATFORM),ansi)
-
- is_hurd := $(strip $(wildcard /hurd/auth))
- ifneq ($(is_hurd),)
-
- PLATFORM := unix
- COPY := cp
- DELETE := rm -f
-
-
- # If `devel' is the requested target, we use a special configuration
- # file named `unix-dev.mk'. It disables optimization and libtool.
- #
- ifneq ($(findstring devel,$(MAKECMDGOALS)),)
- CONFIG_FILE := unix-dev.mk
- CC := gcc
- devel: setup
- else
-
- # If `lccl' is the requested target, we use a special configuration
- # file named `unix-lcc.mk'. It disables libtool for LCC
- #
- ifneq ($(findstring lcc,$(MAKECMDGOALS)),)
- CONFIG_FILE := unix-lcc.mk
- CC := lcc
- lcc: setup
- else
- # If a Unix platform is detected, the configure script is called and
- # `unix-def.mk' together with `unix-cc.mk' is created.
- #
- # Arguments to `configure' should be in the CFG variable. Example:
- #
- # make CFG="--prefix=/usr --disable-static"
- #
- # If you need to set CFLAGS or LDFLAGS, do it here also.
- #
- # Feel free to add support for other platform specific compilers in
- # this directory (e.g. solaris.mk + changes here to detect the
- # platform).
- #
- CONFIG_FILE := unix.mk
- setup: unix-def.mk
- unix: setup
- endif
- endif
-
- setup: std_setup
-
- unix-def.mk: $(TOP)/builds/unix/unix-def.in
- cd builds/unix; $(USE_CFLAGS) ./configure $(CFG)
-
- endif # test Unix
-endif # test PLATFORM
-
-# EOF
-
-
diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk
index 903a574..32de899 100644
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@@ -16,12 +16,12 @@
ifeq ($(PLATFORM),ansi)
- has_init := $(strip $(wildcard /sbin/init))
- ifneq ($(has_init),)
+ is_unix := $(strip $(wildcard /sbin/init) $(wildcard /hurd/auth))
+ ifneq ($(is_unix),)
PLATFORM := unix
- endif # test has_init
+ endif # test is_unix
endif # test PLATFORM ansi
ifeq ($(PLATFORM),unix)