Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't assume mtree is in BINDIR, allow it to be overridden by 

MTREE_CMD.
This commit is contained in:
grant 2003-09-23 06:19:45 +00:00
parent e37cded7b1
commit fd9dca3d28
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/pkg_install/add/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.87 2003/09/08 07:00:10 jlam Exp $ */
/* $NetBSD: perform.c,v 1.88 2003/09/23 06:19:46 grant Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
__RCSID("$NetBSD: perform.c,v 1.87 2003/09/08 07:00:10 jlam Exp $");
__RCSID("$NetBSD: perform.c,v 1.88 2003/09/23 06:19:46 grant Exp $");
#endif
#endif
@ -640,7 +640,7 @@ ignore_replace_depends_check:
if (Verbose)
printf("mtree -U -f %s -d -e -p %s\n", MTREE_FNAME, p ? p->name : "/");
if (!Fake) {
if (vsystem("%s/mtree -U -f %s -d -e -p %s", BINDIR, MTREE_FNAME, p ? p->name : "/"))
if (vsystem("%s -U -f %s -d -e -p %s", MTREE_CMD, MTREE_FNAME, p ? p->name : "/"))
warnx("mtree returned a non-zero status - continuing");
}
unlink(MTREE_FNAME); /* remove this line to tar up pkg later - HF */

10
usr.sbin/pkg_install/lib/lib.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lib.h,v 1.57 2003/09/17 13:27:42 agc Exp $ */
/* $NetBSD: lib.h,v 1.58 2003/09/23 06:19:45 grant Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
@ -89,6 +89,14 @@
#define CHGRP_CMD "chgrp"
#endif
#ifndef MTREE_CMD
# ifdef BINDIR
# define MTREE_CMD BINDIR "/mtree"
# else
# define MTREE_CMD "mtree"
# endif
#endif
/* The names of our "special" files */
#define CONTENTS_FNAME "+CONTENTS"
#define COMMENT_FNAME "+COMMENT"