Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index aff2a7a55..74c8b34f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 18
+PATCHLEVEL = 19
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
@@ -465,7 +465,7 @@ core-y		:= \
 
 libs-y          := \
                 archival/ \
-                archival/libunarchive/ \
+                archival/libarchive/ \
                 console-tools/ \
                 coreutils/ \
                 coreutils/libcoreutils/ \
@@ -1010,8 +1010,8 @@ $(mrproper-dirs):
 mrproper: clean archmrproper $(mrproper-dirs)
         $(call cmd,rmdirs)
         $(call cmd,rmfiles)
-        @find -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f
-        @find -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f
+        @find . -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f
+        @find . -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f
 
 # distclean
 #