Date: Fri, 7 Jun 2002 21:43:50 -0700 From: "J. Mallett" <jmallett@FreeBSD.org> To: "Steven G. Kargl" <kargl@troutmask.apl.washington.edu> Cc: freebsd-current@freebsd.org Subject: Re: patches for [x]install Message-ID: <20020607214350.A25230@FreeBSD.ORG> In-Reply-To: <200206080439.g584dlv6068842@troutmask.apl.washington.edu>; from kargl@troutmask.apl.washington.edu on Fri, Jun 07, 2002 at 09:39:47PM -0700 References: <200206080439.g584dlv6068842@troutmask.apl.washington.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
* From "Steven G. Kargl" <kargl@troutmask.apl.washington.edu> > The first patch fixes install(1). The reamining patches > correctly document the breakage of rev 1.55 of xinstall.c The last patch is wrong, the others are good, though a warning about the overriding of flags might be nice until this is ACCEPTED behaviour by the user community. The third patch is wrong because there are things other than -C that one might want to override INSTALL with, for example an INSTALL that uses a replacement program that static relinks an executable being installed to a partition where its dynamic dependencies are not satisfied. I've known people to do similar. > --- usr.bin/xinstall/xinstall.c.orig Thu Jun 6 22:45:29 2002 > +++ usr.bin/xinstall/xinstall.c Fri Jun 7 17:55:44 2002 > @@ -173,8 +173,11 @@ > argv += optind; > > /* some options make no sense when creating directories */ > - if ((safecopy || docompare || dostrip) && dodir) > - usage(); > + if (dodir) { > + safecopy = 0; > + docompare = 0; > + dostrip = 0; > + } > > /* must have at least two arguments, except when creating directories */ > if (argc < 2 && !dodir) > > > > --- share/examples/etc/make.conf.orig Fri Jun 7 18:01:36 2002 > +++ share/examples/etc/make.conf Fri Jun 7 18:01:58 2002 > @@ -73,9 +73,6 @@ > # be the highest optimization value used. > #WANT_FORCE_OPTIMIZATION_DOWNGRADE=1 > # > -# Compare before install > -#INSTALL=install -C > -# > # Mtree will follow symlinks > #MTREE_FOLLOWS_SYMLINKS= -L > # > --- share/man/man5/make.conf.5.orig Fri Jun 7 18:02:30 2002 > +++ share/man/man5/make.conf.5 Fri Jun 7 18:03:46 2002 > @@ -130,14 +130,6 @@ > .Dq Li += > instead of > .Dq Li = . > -.It Va INSTALL > -.Pq Vt str > -the default install command. > -To have commands compared before doing > -the install, use > -.Bd -literal -offset indent > -INSTALL="install -C" > -.Ed > .It Va LOCAL_DIRS > .Pq Vt str > List any directories that should be entered when doing > --- share/mk/sys.mk.orig Fri Jun 7 18:05:26 2002 > +++ share/mk/sys.mk Fri Jun 7 18:06:13 2002 > @@ -67,7 +67,7 @@ > .endif > EFLAGS ?= > > -INSTALL ?= install > +INSTALL = install > > LEX ?= lex > LFLAGS ?= > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-current" in the body of the message -- J. Mallett <jmallett@FreeBSD.org> FreeBSD: The Power To Serve "I've coined new words, like, misunderstanding and Hispanically." -- George W. Bush, Radio-Television Correspondents Association dinner, Washington, D.C., March 29, 2001 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020607214350.A25230>