diff options
| -rw-r--r-- | security/vlock/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | security/vlock/files/patch-modules-Makefile | 6 | ||||
| -rw-r--r-- | security/vlock/files/patch-scripts-Makefile | 11 |
3 files changed, 37 insertions, 8 deletions
diff --git a/security/vlock/files/patch-Makefile b/security/vlock/files/patch-Makefile index ec25a46f6e99..826af9c379e0 100644 --- a/security/vlock/files/patch-Makefile +++ b/security/vlock/files/patch-Makefile @@ -1,11 +1,29 @@ ---- Makefile.orig 2013-11-20 17:41:38.000000000 +0100 -+++ Makefile 2013-11-20 17:43:12.000000000 +0100 -@@ -59,7 +59,7 @@ +--- Makefile.orig 2011-09-18 15:22:35 UTC ++++ Makefile +@@ -57,9 +57,9 @@ + .PHONY: install-programs + install-programs: $(PROGRAMS) $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/bin - $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(BINDIR)/vlock +- $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(BINDIR)/vlock ++ $(BSD_INSTALL_SCRIPT) vlock $(DESTDIR)$(BINDIR)/vlock $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/sbin - $(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-main $(DESTDIR)$(SBINDIR)/vlock-main -+ $(INSTALL) -s -m 4711 -o root -g $(ROOT_GROUP) vlock-main $(DESTDIR)$(SBINDIR)/vlock-main ++ $(BSD_INSTALL_PROGRAM) vlock-main $(DESTDIR)$(SBINDIR)/vlock-main .PHONY: install-plugins install-plugins: install-modules install-scripts +@@ -75,11 +75,11 @@ + .PHONY: install-man + install-man: + $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man1 +- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(MANDIR)/man1/vlock.1 ++ $(BSD_INSTALL_MAN) man/vlock.1 $(DESTDIR)$(MANDIR)/man1/vlock.1 + $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man8 +- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-main.8 $(DESTDIR)$(MANDIR)/man8/vlock-main.8 ++ $(BSD_INSTALL_MAN) man/vlock-main.8 $(DESTDIR)$(MANDIR)/man8/vlock-main.8 + $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man5 +- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-plugins.5 $(DESTDIR)$(MANDIR)/man5/vlock-plugins.5 ++ $(BSD_INSTALL_MAN) man/vlock-plugins.5 $(DESTDIR)$(MANDIR)/man5/vlock-plugins.5 + + + ### build rules ### diff --git a/security/vlock/files/patch-modules-Makefile b/security/vlock/files/patch-modules-Makefile index 55325e437b27..a454862036fd 100644 --- a/security/vlock/files/patch-modules-Makefile +++ b/security/vlock/files/patch-modules-Makefile @@ -1,5 +1,5 @@ ---- modules/Makefile.orig 2013-11-20 17:39:23.000000000 +0100 -+++ modules/Makefile 2013-11-20 17:40:03.000000000 +0100 +--- modules/Makefile.orig 2011-09-18 15:22:35 UTC ++++ modules/Makefile @@ -15,7 +15,7 @@ #special build rules @@ -14,7 +14,7 @@ install-%.so: %.so $(MKDIR_P) -m 755 $(DESTDIR)$(MODULEDIR) - $(INSTALL) -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $< $(DESTDIR)$(MODULEDIR)/$< -+ $(INSTALL) -s -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $< $(DESTDIR)$(MODULEDIR)/$< ++ $(BSD_INSTALL_LIB) $< $(DESTDIR)$(MODULEDIR)/$< .PHONY: clean clean: diff --git a/security/vlock/files/patch-scripts-Makefile b/security/vlock/files/patch-scripts-Makefile new file mode 100644 index 000000000000..a2c81fde88d9 --- /dev/null +++ b/security/vlock/files/patch-scripts-Makefile @@ -0,0 +1,11 @@ +--- scripts/Makefile.orig 2011-09-18 15:22:35 UTC ++++ scripts/Makefile +@@ -12,7 +12,7 @@ + install-%.sh : SCRIPT_TARGET=$(<:.sh=) + install-%: % + $(MKDIR_P) -m 755 $(DESTDIR)$(SCRIPTDIR) +- $(INSTALL) -m $(SCRIPT_MODE) -o root -g $(SCRIPT_GROUP) $< $(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET) ++ $(BSD_INSTALL_SCRIPT) $< $(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET) + + .PHONY: clean + clean: |