-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5yWtMACgkQrlYvE4MpobO7ZwCg5nPMJYhTc6Pi8wyaO1ZhvyJE MzAAniMfb/l2QJFrrN1C3ATIHtTr64an =QI7v -----END PGP SIGNATURE-----
>From 444b8e99c784fd41521a965dacc16f096cd178a7 Mon Sep 17 00:00:00 2001 From: Guido Trentalancia <guido@xxxxxxxxxxxxxxxx> Date: Wed, 14 Sep 2011 14:54:34 -0400 Subject: [PATCH 66/67] whole tree: default make target to all not install Change the default "make" target for the libraries from "install" to "all" in the makefiles. Signed-off-by: Guido Trentalancia <guido@xxxxxxxxxxxxxxxx> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- libselinux/include/Makefile | 4 +++- libselinux/man/Makefile | 4 +++- libsemanage/include/Makefile | 4 +++- libsemanage/man/Makefile | 4 +++- libsepol/include/Makefile | 4 +++- libsepol/man/Makefile | 4 +++- policycoreutils/mcstrans/man/Makefile | 4 +++- sepolgen/src/sepolgen/Makefile | 4 +++- sepolgen/src/share/Makefile | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libselinux/include/Makefile b/libselinux/include/Makefile index e19bef8..09bcea3 100644 --- a/libselinux/include/Makefile +++ b/libselinux/include/Makefile @@ -2,7 +2,9 @@ PREFIX ?= $(DESTDIR)/usr INCDIR ?= $(PREFIX)/include/selinux -install: +all: + +install: all test -d $(INCDIR) || install -m 755 -d $(INCDIR) install -m 644 $(wildcard selinux/*.h) $(INCDIR) diff --git a/libselinux/man/Makefile b/libselinux/man/Makefile index 984b6af..a20a5d1 100644 --- a/libselinux/man/Makefile +++ b/libselinux/man/Makefile @@ -3,7 +3,9 @@ MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 MAN5DIR ?= $(DESTDIR)/usr/share/man/man5 MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 -install: +all: + +install: all mkdir -p $(MAN3DIR) mkdir -p $(MAN5DIR) mkdir -p $(MAN8DIR) diff --git a/libsemanage/include/Makefile b/libsemanage/include/Makefile index 391f950..b660660 100644 --- a/libsemanage/include/Makefile +++ b/libsemanage/include/Makefile @@ -2,7 +2,9 @@ PREFIX ?= $(DESTDIR)/usr INCDIR ?= $(PREFIX)/include/semanage -install: +all: + +install: all test -d $(INCDIR) || install -m 755 -d $(INCDIR) install -m 644 $(wildcard semanage/*.h) $(INCDIR) diff --git a/libsemanage/man/Makefile b/libsemanage/man/Makefile index a84bfb7..8b2a2b9 100644 --- a/libsemanage/man/Makefile +++ b/libsemanage/man/Makefile @@ -1,7 +1,9 @@ # Installation directories. MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 -install: +all: + +install: all mkdir -p $(MAN3DIR) install -m 644 man3/*.3 $(MAN3DIR) diff --git a/libsepol/include/Makefile b/libsepol/include/Makefile index 0cd00ab..2ef418c 100644 --- a/libsepol/include/Makefile +++ b/libsepol/include/Makefile @@ -2,7 +2,9 @@ PREFIX ?= $(DESTDIR)/usr INCDIR ?= $(PREFIX)/include/sepol -install: +all: + +install: all test -d $(INCDIR) || install -m 755 -d $(INCDIR) test -d $(INCDIR)/policydb || install -m 755 -d $(INCDIR)/policydb install -m 644 $(wildcard sepol/*.h) $(INCDIR) diff --git a/libsepol/man/Makefile b/libsepol/man/Makefile index b96bc94..1192433 100644 --- a/libsepol/man/Makefile +++ b/libsepol/man/Makefile @@ -2,7 +2,9 @@ MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 MAN3DIR ?= $(DESTDIR)/usr/share/man/man3 -install: +all: + +install: all mkdir -p $(MAN3DIR) mkdir -p $(MAN8DIR) install -m 644 man3/*.3 $(MAN3DIR) diff --git a/policycoreutils/mcstrans/man/Makefile b/policycoreutils/mcstrans/man/Makefile index f07ec96..8e97119 100644 --- a/policycoreutils/mcstrans/man/Makefile +++ b/policycoreutils/mcstrans/man/Makefile @@ -1,7 +1,9 @@ # Installation directories. MAN8DIR ?= $(DESTDIR)/usr/share/man/man8 -install: +all: + +install: all mkdir -p $(MAN8DIR) install -m 644 man8/*.8 $(MAN8DIR) diff --git a/sepolgen/src/sepolgen/Makefile b/sepolgen/src/sepolgen/Makefile index d658179..eadc0aa 100644 --- a/sepolgen/src/sepolgen/Makefile +++ b/sepolgen/src/sepolgen/Makefile @@ -1,7 +1,9 @@ PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib(1)") PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/sepolgen -install: +all: + +install: all -mkdir -p $(PACKAGEDIR) install -m 644 *.py $(PACKAGEDIR) diff --git a/sepolgen/src/share/Makefile b/sepolgen/src/share/Makefile index c46229b..abf5e45 100644 --- a/sepolgen/src/share/Makefile +++ b/sepolgen/src/share/Makefile @@ -1,6 +1,8 @@ SHAREDIR ?= $(DESTDIR)/var/lib/sepolgen -install: +all: + +install: all -mkdir -p $(SHAREDIR) install -m 644 perm_map $(SHAREDIR) -- 1.7.6.2
