From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C891058974 for ; Sat, 23 Jan 2016 22:49:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B27C21C010; Sat, 23 Jan 2016 22:49:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDFBE21C00E for ; Sat, 23 Jan 2016 22:49:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B08C633FD24 for ; Sat, 23 Jan 2016 22:49:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41489CB3 for ; Sat, 23 Jan 2016 22:49:10 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1453588548.860d09dc1cf3f08e8ef2caad5b11b19ae6b9fa61.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 860d09dc1cf3f08e8ef2caad5b11b19ae6b9fa61 X-VCS-Branch: master Date: Sat, 23 Jan 2016 22:49:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a14d9e67-b021-4826-8a1c-8186d71ad836 X-Archives-Hash: b8aae145f2537e524616e0e930f3bd93 commit: 860d09dc1cf3f08e8ef2caad5b11b19ae6b9fa61 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jan 23 22:35:48 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jan 23 22:35:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=860d09dc Improve clarity for makefile command. Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0a339e3..207f7cf 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,11 @@ distclean: clean # Generic rules %/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile - grep -sq THIS_CONFIG_IS_BROKEN $< && cat $< >$@ || grep -sq perl merge.pl $< $(BASE_KCONF) > $@ + if grep -sq THIS_CONFIG_IS_BROKEN $< ; then \ + cat $< >$@ ; \ + else \ + perl merge.pl $< $(BASE_KCONF) > $@ ; \ + fi ; %.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \