--- hurd.orig/libpthread/Makefile	2006-07-23 17:36:15.000000000 +0000
+++ hurd/libpthread/Makefile	2006-07-23 17:26:23.000000000 +0000
@@ -169,15 +169,16 @@ VPATH += $(SYSDEP_PATH)
 
 HURDLIBS = ihash
 
-CFLAGS := -D_IO_MTSAFE_IO				\
+installhdrs :=
+installhdrsubdir := .
+
+include ../Makeconf
+
+CFLAGS += -D_IO_MTSAFE_IO				\
 	   $(addprefix -I, $(SYSDEP_PATH))		\
 	  -imacros $(srcdir)/include/libc-symbols.h	\
 	  -imacros $(srcdir)/not-in-libc.h
 
-installhdrs :=
-installhdrsubdir = .
-
-include ../Makeconf
 
 install: install-headers $(libdir)/libpthread2.a $(libdir)/libpthread2_pic.a
 install-headers: $(addprefix $(includedir)/, $(sysdeps_headers))
