diff options
| author | Martin Natano <natano@cvs.openbsd.org> | 2016-09-29 09:16:22 +0000 |
|---|---|---|
| committer | Martin Natano <natano@cvs.openbsd.org> | 2016-09-29 09:16:22 +0000 |
| commit | 457ac54c90a393e4a9a2cf2658bb19bfb6ac91ed (patch) | |
| tree | a439b63fa34c1c787aa5ca8c045a8e3c52b88eb6 /gnu/usr.bin/cvs | |
| parent | 25fd8685ea12f79d0b326e1e00fe9fcc297120cc (diff) | |
Set correct owner for installed files. Required for noperm release.
ok tb
Diffstat (limited to 'gnu/usr.bin/cvs')
| -rw-r--r-- | gnu/usr.bin/cvs/Makefile.bsd-wrapper | 28 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/Makefile.in | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/mkinstalldirs | 2 |
3 files changed, 18 insertions, 15 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper index 713ccc192fb..5015031e24a 100644 --- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper +++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.54 2016/09/20 18:36:57 natano Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.55 2016/09/29 09:16:21 natano Exp $ .include <bsd.own.mk> @@ -28,21 +28,23 @@ CF= config: .FORCE -rm -f config.cache PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ - INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY}" \ - ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \ - MAKEINFO='makeinfo --no-split' \ - sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \ - --datadir=/usr/libdata ${CF} + INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \ + INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \ + INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE}" \ + ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \ + MAKEINFO='makeinfo --no-split' \ + sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \ + --datadir=/usr/libdata ${CF} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ - INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY}" \ - ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \ - MAKEINFO='makeinfo --no-split' \ - sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \ - --datadir=/usr/libdata ${CF} + INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \ + INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \ + INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE}" \ + ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \ + MAKEINFO='makeinfo --no-split' \ + sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \ + --datadir=/usr/libdata ${CF} .ifdef NOMAN maninstall: diff --git a/gnu/usr.bin/cvs/contrib/Makefile.in b/gnu/usr.bin/cvs/contrib/Makefile.in index 9b6db476971..a24816eba1b 100644 --- a/gnu/usr.bin/cvs/contrib/Makefile.in +++ b/gnu/usr.bin/cvs/contrib/Makefile.in @@ -363,7 +363,8 @@ install-data-local: echo "test ! -e $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ echo " && cd $(DESTDIR)$(bindir) && $(LN_S) $(contribscriptdir)/`echo $$p|sed '$(transform)'` ."; \ (test ! -e $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'` \ - && cd $(DESTDIR)$(bindir) && $(LN_S) $(contribscriptdir)/`echo $$p|sed '$(transform)'` .) \ + && cd $(DESTDIR)$(bindir) && $(LN_S) $(contribscriptdir)/`echo $$p|sed '$(transform)'` . \ + && chown root:bin `echo $$p|sed '$(transform)'`) \ || (echo "Link creation failed" && if test -f $$p; then \ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ diff --git a/gnu/usr.bin/cvs/mkinstalldirs b/gnu/usr.bin/cvs/mkinstalldirs index 91f6d04e17c..d4d8016bc97 100644 --- a/gnu/usr.bin/cvs/mkinstalldirs +++ b/gnu/usr.bin/cvs/mkinstalldirs @@ -20,7 +20,7 @@ for file in ${1+"$@"} ; do if test ! -d "$pathcomp"; then echo "mkdir $pathcomp" 1>&2 - mkdir "$pathcomp" || errstatus=$? + install -d -o root -g wheel "$pathcomp" || errstatus=$? fi pathcomp="$pathcomp/" |