Complete htl subdir switch

* Makeconfig (shared-thread-library, static-thread-library, rpath-dirs,
includes): Fix patch from libpthread/ to htl/.
* Makefile (extra-B-pthread.so): Likewise.

2 files changed, 6 insertions, 6 deletions

diff --git a/Makeconfig b/Makeconfig
index e90f5f7..044c4e6 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -3,11 +3,11 @@
 
 have-thread-library = yes
 
-shared-thread-library = $(common-objpfx)libpthread/libpthread_nonshared.a \
-			$(common-objpfx)libpthread/libpthread.so
-static-thread-library = $(common-objpfx)libpthread/libpthread.a
+shared-thread-library = $(common-objpfx)htl/libpthread_nonshared.a \
+			$(common-objpfx)htl/libpthread.so
+static-thread-library = $(common-objpfx)htl/libpthread.a
 bounded-thread-library = $(static-thread-library)
 
-rpath-dirs += libpthread
+rpath-dirs += htl
 
-+includes += -I$(..)libpthread/include
++includes += -I$(..)htl/include
diff --git a/Makefile b/Makefile
index 2fab448..d64be68 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ $(inst_libdir)/libpthread2_pic.a: $(inst_libdir)/libpthread_pic.a
 ifeq ($(IN_GLIBC),yes)
 libc-link.so = $(common-objpfx)libc.so
 
-extra-B-pthread.so = -B$(common-objpfx)libpthread/
+extra-B-pthread.so = -B$(common-objpfx)htl/
 
 include ../Rules