diff options
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/autofs/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/autofs/auto_master (renamed from etc/auto_master) | 0 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/Makefile (renamed from etc/autofs/Makefile) | 6 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/include_ldap (renamed from etc/autofs/include_ldap) | 0 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/include_nis (renamed from etc/autofs/include_nis) | 0 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/include_nis_nullfs (renamed from etc/autofs/include_nis_nullfs) | 0 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/special_hosts (renamed from etc/autofs/special_hosts) | 0 | ||||
| -rwxr-xr-x | usr.sbin/autofs/autofs/special_media (renamed from etc/autofs/special_media) | 0 | ||||
| -rwxr-xr-x | usr.sbin/autofs/autofs/special_noauto (renamed from etc/autofs/special_noauto) | 0 | ||||
| -rw-r--r-- | usr.sbin/autofs/autofs/special_null (renamed from etc/autofs/special_null) | 0 |
11 files changed, 6 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index 90f7096f4cf8..af3b2676056d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -190,9 +190,6 @@ distribution: echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif -.if ${MK_AUTOFS} != "no" - ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install -.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif diff --git a/usr.sbin/autofs/Makefile b/usr.sbin/autofs/Makefile index 760ec561ba6b..d901e35a523c 100644 --- a/usr.sbin/autofs/Makefile +++ b/usr.sbin/autofs/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= auto_master PACKAGE=autofs PROG= automountd SRCS= automount.c @@ -30,4 +31,6 @@ LINKS+= ${BINDIR}/automountd ${BINDIR}/autounmountd .PATH: ${MOUNT} +SUBDIR= autofs + .include <bsd.prog.mk> diff --git a/etc/auto_master b/usr.sbin/autofs/auto_master index 55ee99172ea0..55ee99172ea0 100644 --- a/etc/auto_master +++ b/usr.sbin/autofs/auto_master diff --git a/etc/autofs/Makefile b/usr.sbin/autofs/autofs/Makefile index 822e523c9f15..772efd38266f 100644 --- a/etc/autofs/Makefile +++ b/usr.sbin/autofs/autofs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= include_ldap \ +CONFS= include_ldap \ include_nis \ include_nis_nullfs \ special_hosts \ @@ -9,7 +9,7 @@ FILES= include_ldap \ special_null NO_OBJ= -FILESDIR= /etc/autofs -FILESMODE= 755 +CONFDIR= /etc/autofs +CONFMODE= 755 .include <bsd.prog.mk> diff --git a/etc/autofs/include_ldap b/usr.sbin/autofs/autofs/include_ldap index 4cf70bfeef81..4cf70bfeef81 100644 --- a/etc/autofs/include_ldap +++ b/usr.sbin/autofs/autofs/include_ldap diff --git a/etc/autofs/include_nis b/usr.sbin/autofs/autofs/include_nis index 5289984639a1..5289984639a1 100644 --- a/etc/autofs/include_nis +++ b/usr.sbin/autofs/autofs/include_nis diff --git a/etc/autofs/include_nis_nullfs b/usr.sbin/autofs/autofs/include_nis_nullfs index 6ef815d57c6b..6ef815d57c6b 100644 --- a/etc/autofs/include_nis_nullfs +++ b/usr.sbin/autofs/autofs/include_nis_nullfs diff --git a/etc/autofs/special_hosts b/usr.sbin/autofs/autofs/special_hosts index c49854681451..c49854681451 100644 --- a/etc/autofs/special_hosts +++ b/usr.sbin/autofs/autofs/special_hosts diff --git a/etc/autofs/special_media b/usr.sbin/autofs/autofs/special_media index dbd7457b445f..dbd7457b445f 100755 --- a/etc/autofs/special_media +++ b/usr.sbin/autofs/autofs/special_media diff --git a/etc/autofs/special_noauto b/usr.sbin/autofs/autofs/special_noauto index 219ec7ea6994..219ec7ea6994 100755 --- a/etc/autofs/special_noauto +++ b/usr.sbin/autofs/autofs/special_noauto diff --git a/etc/autofs/special_null b/usr.sbin/autofs/autofs/special_null index 41c10001e676..41c10001e676 100644 --- a/etc/autofs/special_null +++ b/usr.sbin/autofs/autofs/special_null |