a275d04aab
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/autofs#1cda5aaae19a25dd9afa10a9ed1763ac59640019
95 lines
3.5 KiB
Diff
95 lines
3.5 KiB
Diff
samples: fix Makefile targets' directory dependencies
|
|
|
|
From: Kyle Russell <bkylerussell@gmail.com>
|
|
|
|
Introduce an order-only prerequisite on dirs for targets that actually
|
|
use these directories to guarantee they exist at install time; otherwise,
|
|
the sample install commands can result in ENOENT in a parallelized make
|
|
invocation.
|
|
|
|
Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
|
|
---
|
|
CHANGELOG | 1 +
|
|
samples/Makefile | 14 +++++++-------
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index f53f9adf..106b811c 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -5,6 +5,7 @@ xx/xx/2020 autofs-5.1.7
|
|
- fix browse dir not re-created on symlink expire.
|
|
- fix a regression with map instance lookup.
|
|
- correct fsf address.
|
|
+- samples: fix Makefile targets' directory dependencies
|
|
|
|
07/10/2019 autofs-5.1.6
|
|
- support strictexpire mount option.
|
|
diff --git a/samples/Makefile b/samples/Makefile
|
|
index e7f242a7..a505b1f9 100644
|
|
--- a/samples/Makefile
|
|
+++ b/samples/Makefile
|
|
@@ -53,7 +53,7 @@ CONFIG = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs.conf.orig || echo
|
|
CEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs || echo "no")
|
|
|
|
.PHONY: autofs.conf
|
|
-autofs.conf: autofs.conf.default
|
|
+autofs.conf: autofs.conf.default | dirs
|
|
@echo
|
|
@echo "Installing autofs default configuation in $(autofsmapdir)"
|
|
@if test -z "$(CONFIG)" ; \
|
|
@@ -76,7 +76,7 @@ CINIT = $(shell test -e $(INSTALLROOT)$(autofsconfdir)/autofs.orig || echo "-b -
|
|
CIEXISTS = $(shell test -e $(INSTALLROOT)$(autofsconfdir)/autofs || echo "no")
|
|
|
|
.PHONY: autofs.sysinit
|
|
-autofs.sysinit: autofs.init.conf
|
|
+autofs.sysinit: autofs.init.conf | dirs
|
|
@echo
|
|
@echo "Installing autofs init configuation in $(autofsconfdir)"
|
|
@if test -z "$(CINIT)" ; \
|
|
@@ -99,7 +99,7 @@ AUTH = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf.orig
|
|
AEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/autofs_ldap_auth.conf || echo "no")
|
|
|
|
.PHONY: autofs_ldap_auth.conf
|
|
-autofs_ldap_auth.conf:
|
|
+autofs_ldap_auth.conf: | dirs
|
|
@echo
|
|
@echo "Installing autofs ldap auth config \"autofs_ldap_auth.conf\" in $(autofsmapdir)"
|
|
@if test -z "$(AUTH)" ; \
|
|
@@ -122,7 +122,7 @@ MASTER = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.master.orig || echo
|
|
MEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.master || echo "no")
|
|
|
|
.PHONY: auto.master
|
|
-auto.master:
|
|
+auto.master: | dirs
|
|
@echo
|
|
@echo "Installing autofs default master map in $(autofsmapdir)"
|
|
@if test -z "$(MASTER)" ; \
|
|
@@ -145,7 +145,7 @@ MISC = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.misc.orig || echo "-b
|
|
IEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.misc || echo "no")
|
|
|
|
.PHONY: auto.misc
|
|
-auto.misc:
|
|
+auto.misc: | dirs
|
|
@echo
|
|
@echo "Installing autofs sample map \"auto.misc\" in $(autofsmapdir)"
|
|
@if test -z "$(MISC)" ; \
|
|
@@ -168,7 +168,7 @@ NET = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.net.orig || echo "-b --
|
|
NEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.net || echo "no")
|
|
|
|
.PHONY: auto.net
|
|
-auto.net:
|
|
+auto.net: | dirs
|
|
@echo
|
|
@echo "Installing autofs sample map \"auto.net\" in $(autofsmapdir)"
|
|
@if test -z "$(NET)" ; \
|
|
@@ -191,7 +191,7 @@ SMB = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.smb.orig || echo "-b --
|
|
SEXISTS = $(shell test -e $(INSTALLROOT)$(autofsmapdir)/auto.smb || echo "no")
|
|
|
|
.PHONY: auto.smb
|
|
-auto.smb:
|
|
+auto.smb: | dirs
|
|
@echo
|
|
@echo "Installing autofs sample map \"auto.smb\" in $(autofsmapdir)"
|
|
@if test -z "$(SMB)" ; \
|