summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/mach/Makefile8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a096966126..b70cb7264f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-16  Roland McGrath  <roland@frob.com>
 
+	* sysdeps/mach/Makefile (mach-before-compile): Don't include
+	mach_interface.h here, since not all variants use that name.
+
 	* sysdeps/mach/configure.in: Add some checks for Mach headers
 	to ensure a sane installation.
 	(mach_interface_list): Define this variable by checking for .defs
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index da10c0809f..4d4e4c01e2 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1993,94,96,97,2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -29,9 +29,13 @@ ifneq (mach,$(subdir))
 mach-objpfx = $(common-objpfx)mach/
 
 # These are all the generated files that <mach.h> includes.
+# Actually, it's only some of them.  We omit mach_interface.h
+# because it's different in Darwin and the conditional crap is
+# too much trouble.  This should suffice for getting the mach/Makefile
+# rules invoked when they need to be.
 mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
 		       $(patsubst %,$(mach-objpfx)mach/mach_%.h,\
-				  interface port host)
+				  port host)
 
 # This patsubst generates patterns like `m%h-shortcuts.h', which are damn
 # likely to match just the corresponding particular file we want.