touchup include paths

diff --git a/Rules.mak b/Rules.mak
index e59a57e..4ffe17d 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -347,7 +347,8 @@ endif
 PTDIR := $(top_builddir)libpthread/$(PTNAME)
 # set up system dependencies include dirs (NOTE: order matters!)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-PTINC:=        -I$(PTDIR)/compat                                       \
+PTINC := \
+       -I$(PTDIR)/compat                                       \
        -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)       \
        -I$(PTDIR)/sysdeps/$(TARGET_ARCH)                       \
        -I$(PTDIR)/sysdeps/unix/sysv/linux                      \
@@ -374,10 +375,15 @@ gcc_tls_test_fail:
        @exit 1;
 endif
 else
-PTINC:=        -I$(PTDIR)/sysdeps/$(TARGET_ARCH)                       \
-       -I$(PTDIR)/sysdeps/pthread
+PTINC := \
+       -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \
+       -I$(PTDIR)/sysdeps/pthread \
+       -I$(top_builddir)libpthread
 endif
 CFLAGS+=$(PTINC)
+else
+       PTNAME := 
+       PTINC  := 
 endif
 
 # Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'

diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index ad2401c..c80e32c 100644 (file)
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -7,7 +7,7 @@
 
 # Get the thread include dependencies and shared object name
 CFLAGS-linuxthreads_db := -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
-CFLAGS-linuxthreads_db += -I$(top_srcdir)libpthread -D_GNU_SOURCE
+CFLAGS-linuxthreads_db += -D_GNU_SOURCE
 
 LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) -s --warn-unresolved-symbols
 
@@ -44,11 +44,13 @@ $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 ifeq ($(DOPIC),y)
 $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y:.o=.os)
 else
-$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
+$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) $(libthread_db_OUT)/libthread_db_so.a
 endif
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
+ifneq ($(DOPIC),y)
        $(do_strip)
+endif
        $(do_ar)
 
 linuxthreads_db_headers: