Date: Wed, 22 May 2019 07:23:04 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348102 - in head: etc share/examples usr.bin/login Message-ID: <201905220723.x4M7N4bS057699@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Wed May 22 07:23:03 2019 New Revision: 348102 URL: https://svnweb.freebsd.org/changeset/base/348102 Log: pkgbase: Move login.access to usb.bin/login Also remove the etc-examples target as we don't have any files to handle here. Reviewed by: bapt Modified: head/etc/Makefile head/share/examples/Makefile head/usr.bin/login/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Wed May 22 07:22:34 2019 (r348101) +++ head/etc/Makefile Wed May 22 07:23:03 2019 (r348102) @@ -14,10 +14,6 @@ UPDATE_DEPENDFILE= no SUBDIR+=sendmail .endif -BIN1= \ - login.access \ - login.access - # NB: keep these sorted by MK_* knobs .if ${MK_SENDMAIL} == "no" @@ -56,9 +52,6 @@ distribution: @echo "set DESTDIR before running \"make ${.TARGET}\"" @false .endif - cd ${.CURDIR}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${BIN1} ${DESTDIR}/etc ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap @@ -167,11 +160,6 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY ${INSTALL_SYMLINK} "${nls}" "${DESTDIR}${SHAREDIR}/nls/${alias}" .endfor .endif - -etc-examples: ${META_DEPS} - cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${BIN1} ${BIN2} \ - ${DESTDIR}${SHAREDIR}/examples/etc .include <bsd.prog.mk> Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Wed May 22 07:22:34 2019 (r348101) +++ head/share/examples/Makefile Wed May 22 07:23:03 2019 (r348102) @@ -381,9 +381,8 @@ SER_${d:tu:C/\//_/g}DIR+= ${SHAREDIR}/examples/${d} BINDIR= ${SHAREDIR}/examples -beforeinstall: copies etc-examples +beforeinstall: copies META_TARGETS+= copies -.ORDER: etc-examples copies: .for i in ${LDIRS} @@ -391,9 +390,6 @@ copies: rm -f ${DESTDIR}${BINDIR}/$i; \ fi .endfor - -etc-examples: - ${_+_}(cd ${SRCTOP}/etc; ${MAKE} etc-examples) SUBDIR+= smbfs Modified: head/usr.bin/login/Makefile ============================================================================== --- head/usr.bin/login/Makefile Wed May 22 07:22:34 2019 (r348101) +++ head/usr.bin/login/Makefile Wed May 22 07:23:03 2019 (r348102) @@ -3,7 +3,7 @@ .include <src.opts.mk> -CONFS= fbtab login.conf motd +CONFS= fbtab login.conf motd login.access PROG= login SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905220723.x4M7N4bS057699>