From patchwork Sun Aug 28 22:10:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 9302971 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 70478607D6 for ; Sun, 28 Aug 2016 22:16:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50F342868E for ; Sun, 28 Aug 2016 22:16:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D863287DC; Sun, 28 Aug 2016 22:16:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E63E2868E for ; Sun, 28 Aug 2016 22:16:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7SMCf1X035074; Sun, 28 Aug 2016 18:12:42 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u7SMCdmX012355 for ; Sun, 28 Aug 2016 18:12:39 -0400 Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7SMCdCe022528 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sun, 28 Aug 2016 18:12:39 -0400 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54ED9C057FA9 for ; Sun, 28 Aug 2016 22:12:38 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id i138so7203051wmf.3 for ; Sun, 28 Aug 2016 15:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XaMHVbsd93upUQ6byAGcTLATwWOD8sudvBwS68mEj1s=; b=T+VPAujHFANIZNEFwYVe9+9VrPJoyOJoZEhKiPfFKqTzl4+2pX3E3/s6xZpm++BnRB Y/1NhDD4fuNC4hngE8DZa9uUi821Y0pFfFNhUGqbqTF9xIN35TilSD3b5i7yqNzZNUHD 0NRtTAxqhZzkctt05SKAQojXbjgGJDrX1zTr5Tgr5YRsVAL7kh8FFKaoiWv0h2LTb7t7 Ifwwkd5qlaCKCf+QVbl0kkZhtFDUSraz+VZ90CWeDO9TdouC6jv1gVR11lOyq+AqXFOZ T5o8B6J/QsWYLbBBaPhm+bbahEEnY22qKltkcBKaN4KKk9Bj8YWj2bfIUvU+J1kK0w8q flug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XaMHVbsd93upUQ6byAGcTLATwWOD8sudvBwS68mEj1s=; b=hY9kVe8xnEmC6/Sxe66ZPPh1dJpkZmfk15+bhYGgvp9joEADQ71LSpRGo0a7iXWnPv VBwT/nCb3sUlUHljoJgS6sRBoWLpHuCUJVGuRMDPlTclAMYzay8UMviaNZbo4nmVj1zA Edta7s5h7H2TflV86+G+kHAAgoPlt2bRt2t2IlQJPQXHNl1rLRwi2Hmyw1+hINW35sCx oX/rbm5zQ0+rgPn0eIvWR1J9btyPrt8mgXT9SrupIK/X7DRIeBAfUFm8Wsh087X47Yxc faVjpoNs2YDN4sKWwDDvA3cWjBsVn88puJDXZxiQgBU4eGb0ip4ln5bKSETbJVvjZO6m vrqw== X-Gm-Message-State: AE9vXwOuWeH8VTJ8AlAm/ju8as81QdZJ1Tk0YC/rtlFEAX+4orvW81B+y1+4mdIzrDKylQ== X-Received: by 10.28.55.67 with SMTP id e64mr8035351wma.107.1472422356990; Sun, 28 Aug 2016 15:12:36 -0700 (PDT) Received: from localhost ([46.222.4.238]) by smtp.gmail.com with ESMTPSA id ce6sm13455664wjc.27.2016.08.28.15.12.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Aug 2016 15:12:36 -0700 (PDT) From: Xose Vazquez Perez To: Date: Mon, 29 Aug 2016 00:10:42 +0200 Message-Id: <1472422242-9343-1-git-send-email-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 28 Aug 2016 22:12:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 28 Aug 2016 22:12:38 +0000 (UTC) for IP:'74.125.82.66' DOMAIN:'mail-wm0-f66.google.com' HELO:'mail-wm0-f66.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.02 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.66 mail-wm0-f66.google.com 74.125.82.66 mail-wm0-f66.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-loop: dm-devel@redhat.com Cc: device-mapper development , Xose Vazquez Perez Subject: [dm-devel] [PATCH] multipath-tools: Makefiles housekeeping X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP replace mandir with man8dir and put KRNL variables in place. Cc: Christophe Varoqui Cc: device-mapper development Signed-off-by: Xose Vazquez Perez --- Makefile | 5 ++--- Makefile.inc | 2 +- kpartx/Makefile | 6 +++--- mpathpersist/Makefile | 6 +++--- multipath/Makefile | 6 +++--- multipathd/Makefile | 6 +++--- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 95c7dfb..228d9ac 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,8 @@ ifeq ($(KRNLSRC),) KRNLSRC = $(KRNLLIB)/build KRNLOBJ = $(KRNLLIB)/build endif + export KRNLSRC + export KRNLOBJ endif ifeq ($(MULTIPATH_VERSION),) @@ -22,9 +24,6 @@ else VERSION = $(MULTIPATH_VERSION) endif -export KRNLSRC -export KRNLOBJ - BUILDDIRS = \ libmpathcmd \ libmultipath \ diff --git a/Makefile.inc b/Makefile.inc index 0808e64..56705c4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -45,7 +45,7 @@ bindir = $(exec_prefix)/sbin libudevdir = $(prefix)/$(SYSTEMDPATH)/udev udevrulesdir = $(libudevdir)/rules.d multipathdir = $(TOPDIR)/libmultipath -mandir = $(prefix)/usr/share/man/man8 +man8dir = $(prefix)/usr/share/man/man8 man5dir = $(prefix)/usr/share/man/man5 man3dir = $(prefix)/usr/share/man/man3 syslibdir = $(prefix)/$(LIB) diff --git a/kpartx/Makefile b/kpartx/Makefile index 853288f..e8a59f2 100644 --- a/kpartx/Makefile +++ b/kpartx/Makefile @@ -31,12 +31,12 @@ install: $(EXEC) $(EXEC).8 $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) uninstall: $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz $(RM) $(DESTDIR)$(libudevdir)/kpartx_id $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile index 7921619..47043bb 100644 --- a/mpathpersist/Makefile +++ b/mpathpersist/Makefile @@ -18,12 +18,12 @@ $(EXEC): $(OBJS) install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) clean: $(RM) core *.o $(EXEC) *.gz uninstall: $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz diff --git a/multipath/Makefile b/multipath/Makefile index f296add..cad34bf 100644 --- a/multipath/Makefile +++ b/multipath/Makefile @@ -25,8 +25,8 @@ install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) @@ -34,7 +34,7 @@ uninstall: $(RM) $(DESTDIR)$(bindir)/$(EXEC) $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules - $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz clean: diff --git a/multipathd/Makefile b/multipathd/Makefile index 8524efa..fd3d543 100644 --- a/multipathd/Makefile +++ b/multipathd/Makefile @@ -39,12 +39,12 @@ ifdef SYSTEMD $(INSTALL_PROGRAM) -m 644 $(EXEC).service $(DESTDIR)$(unitdir) $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir) endif - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) uninstall: $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket