diff options
| -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 | 20 |
3 files changed, 20 insertions, 31 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper index de468ca7bb6..713ccc192fb 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.53 2016/09/20 18:29:12 natano Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.54 2016/09/20 18:36:57 natano Exp $ .include <bsd.own.mk> @@ -28,23 +28,21 @@ CF= config: .FORCE -rm -f config.cache PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ - 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} + 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} config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ - 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} + 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} .ifdef NOMAN maninstall: diff --git a/gnu/usr.bin/cvs/contrib/Makefile.in b/gnu/usr.bin/cvs/contrib/Makefile.in index a24816eba1b..9b6db476971 100644 --- a/gnu/usr.bin/cvs/contrib/Makefile.in +++ b/gnu/usr.bin/cvs/contrib/Makefile.in @@ -363,8 +363,7 @@ 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)'` . \ - && chown root:bin `echo $$p|sed '$(transform)'`) \ + && cd $(DESTDIR)$(bindir) && $(LN_S) $(contribscriptdir)/`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 83a8dcc1443..91f6d04e17c 100644 --- a/gnu/usr.bin/cvs/mkinstalldirs +++ b/gnu/usr.bin/cvs/mkinstalldirs @@ -1,34 +1,26 @@ -#! /bin/sh +#!/bin/sh # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman <friedman@prep.ai.mit.edu> # Created: 1993-05-16 +# Last modified: 1994-03-25 # Public domain -# $Id: mkinstalldirs,v 1.2 2016/09/20 18:29:12 natano Exp $ - errstatus=0 -for file -do +for file in ${1+"$@"} ; do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift pathcomp= - for d - do + for d in ${1+"$@"} ; do pathcomp="$pathcomp$d" case "$pathcomp" in -* ) pathcomp=./$pathcomp ;; esac if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - install -d -o root -g wheel "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi + echo "mkdir $pathcomp" 1>&2 + mkdir "$pathcomp" || errstatus=$? fi pathcomp="$pathcomp/" |