All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: selinux@tycho.nsa.gov, nicolas.iooss@m4x.org, sds@tycho.nsa.gov
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
Subject: [PATCH v2 12/14] semodule-utils: build: follow standard semantics for DESTDIR and PREFIX
Date: Tue, 16 Jan 2018 21:23:25 +0100	[thread overview]
Message-ID: <20180116202327.23253-13-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180116202327.23253-1-marcus.folkesson@gmail.com>

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 semodule-utils/semodule_expand/Makefile  | 8 +++-----
 semodule-utils/semodule_link/Makefile    | 8 +++-----
 semodule-utils/semodule_package/Makefile | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/semodule-utils/semodule_expand/Makefile b/semodule-utils/semodule_expand/Makefile
index 072f2137..c2ab3f65 100644
--- a/semodule-utils/semodule_expand/Makefile
+++ b/semodule-utils/semodule_expand/Makefile
@@ -1,9 +1,7 @@
 # Installation directories.
-PREFIX ?= $(DESTDIR)/usr
-INCLUDEDIR ?= $(PREFIX)/include
-BINDIR ?= $(PREFIX)/bin
-LIBDIR ?= $(PREFIX)/lib
-MANDIR ?= $(PREFIX)/share/man
+PREFIX ?= /usr
+BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
 
 CFLAGS ?= -Werror -Wall -W
 override LDLIBS += -lsepol
diff --git a/semodule-utils/semodule_link/Makefile b/semodule-utils/semodule_link/Makefile
index cc4687bd..bcf98765 100644
--- a/semodule-utils/semodule_link/Makefile
+++ b/semodule-utils/semodule_link/Makefile
@@ -1,9 +1,7 @@
 # Installation directories.
-PREFIX ?= $(DESTDIR)/usr
-INCLUDEDIR ?= $(PREFIX)/include
-BINDIR ?= $(PREFIX)/bin
-MANDIR ?= $(PREFIX)/share/man
-LIBDIR ?= $(PREFIX)/lib
+PREFIX ?= /usr
+BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
 
 CFLAGS ?= -Werror -Wall -W
 override LDLIBS += -lsepol
diff --git a/semodule-utils/semodule_package/Makefile b/semodule-utils/semodule_package/Makefile
index 96dd7c4f..33a95e16 100644
--- a/semodule-utils/semodule_package/Makefile
+++ b/semodule-utils/semodule_package/Makefile
@@ -1,9 +1,7 @@
 # Installation directories.
-PREFIX ?= $(DESTDIR)/usr
-INCLUDEDIR ?= $(PREFIX)/include
-BINDIR ?= $(PREFIX)/bin
-LIBDIR ?= $(PREFIX)/lib
-MANDIR ?= $(PREFIX)/share/man
+PREFIX ?= /usr
+BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
 
 CFLAGS ?= -Werror -Wall -W
 override LDLIBS += -lsepol
-- 
2.15.1

  parent reply	other threads:[~2018-01-16 20:23 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-16 20:23 Rework of Makefiles v2 Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 01/14] libsepol: build: follow standard semantics for DESTDIR and PREFIX Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 02/14] libselinux: " Marcus Folkesson
2018-01-17 22:12   ` Nicolas Iooss
2018-01-19 12:07     ` Marcus Folkesson
2018-01-22 20:50       ` Nicolas Iooss
2018-01-23 19:34         ` Marcus Folkesson
2018-01-23 19:55           ` Petr Lautrbach
2018-01-23 23:00             ` Nicolas Iooss
2018-01-24  8:23               ` Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 03/14] libsemanage: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 04/14] checkpolicy: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 05/14] gui: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 06/14] mcstrans: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 07/14] policycoreutils: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 08/14] python: " Marcus Folkesson
2018-01-17 10:11   ` Petr Lautrbach
2018-01-17 10:43     ` Marcus Folkesson
2018-01-17 16:38       ` Petr Lautrbach
2018-01-17 19:37         ` Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 09/14] restorecond: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 10/14] sandbox: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 11/14] secilc: " Marcus Folkesson
2018-01-16 20:23 ` Marcus Folkesson [this message]
2018-01-16 20:23 ` [PATCH v2 13/14] dbus: " Marcus Folkesson
2018-01-16 20:23 ` [PATCH v2 14/14] build: add prefix for includes in top Makefile Marcus Folkesson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180116202327.23253-13-marcus.folkesson@gmail.com \
    --to=marcus.folkesson@gmail.com \
    --cc=nicolas.iooss@m4x.org \
    --cc=sds@tycho.nsa.gov \
    --cc=selinux@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.