[linux] 01/08: debian/rules.real: Fix conditional move of include/arch directory

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Fri May 27 13:53:04 UTC 2016


This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 95559b1d5ead3e394ea2c177cdf4f80536e2430c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri May 27 11:51:19 2016 +0100

    debian/rules.real: Fix conditional move of include/arch directory
    
    The command needs to return success if the directory doesn't exist,
    as it will only be created for the tile architecture.
---
 debian/rules.real | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.real b/debian/rules.real
index 2d416e5..715018f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -345,7 +345,7 @@ install-libc-dev_$(ARCH):
 # Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
-	test -d $(OUT_DIR)/include/arch && \
+	test ! -d $(OUT_DIR)/include/arch || \
 		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 
 	+$(MAKE_SELF) install-base

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list