Backport to current build system

diff --git a/Makefile b/Makefile
index 94ded04..8f7a61e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -393,7 +393,7 @@ clean:
        -find . \( -name \*.o -o -name \*.os \) -exec $(RM) {} \;
 
 distclean: clean
-       -find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\#\* \) -exec $(RM) {} \;
+       -find . \( -name core -o -name \*.orig -o -name \*~ \) -exec $(RM) {} \;
        $(RM) .config .config.old .config.cmd
        $(RM) extra/locale/*.txt
        $(MAKE) -C extra clean

diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index 22779c3..78364d7 100644 (file)
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -42,7 +42,7 @@ SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
 ARCH_CSRC := $(wildcard sysdeps/$(TARGET_ARCH)/*.c)
 ARCH_OBJS := $(patsubst %.c,%.o, $(ARCH_CSRC))
--include sysdeps/$(TARGET_ARCH)/Makefile.in
+-include sysdeps/$(TARGET_ARCH)/Makefile.arch
 
 CSRC = $(wildcard *.c)
 ifneq ($(UCLIBC_HAS_XLOCALE),y)