diff options
| author | tv <tv@pkgsrc.org> | 2004-03-29 02:24:11 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-03-29 02:24:11 +0000 |
| commit | 1ccbfa9d6c88fd8902aae0114406c910e5a9ebab (patch) | |
| tree | 1d8405de2ac5c580b4bb81f327c75f67398678a4 /pkgtools | |
| parent | 2f49208baa8b9e53dbe96155bf579790d19b60d7 (diff) | |
| download | pkgsrc-1ccbfa9d6c88fd8902aae0114406c910e5a9ebab.tar.gz | |
Obey CPPFLAGS.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/delete/main.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 31f7e9bb9e3..0d9d33f0b7a 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2004/03/28 02:26:42 grant Exp $ +# $NetBSD: Makefile,v 1.99 2004/03/29 02:24:11 tv Exp $ # Notes to package maintainers: # @@ -69,7 +69,8 @@ do-extract: @${CP} -Rp ${FILESDIR} ${WRKSRC} pre-configure: - cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV} CC="${CC}" ./configure && \ + cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV} \ + CC="${CC}" CPPFLAGS="${CPPFLAGS:M*}" ./configure && \ ${MAKE_PROGRAM} post-install: diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 6c42e60a474..50f259a8e43 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.15 2004/01/14 23:55:29 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.16 2004/03/29 02:24:11 tv Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #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.15 2004/01/14 23:55:29 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.16 2004/03/29 02:24:11 tv Exp $"); #endif #endif @@ -720,9 +720,13 @@ ignore_replace_depends_check: if (!NoRecord && !Fake) { char contents[FILENAME_MAX]; +#ifdef __INTERIX + umask(002); +#else umask(022); if (getuid() != 0) warnx("not running as root - trying to record install anyway"); +#endif if (!PkgName) { warnx("no package name! can't record package, sorry"); errc = 1; diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c index e9b2af39bcf..75184d0fd26 100644 --- a/pkgtools/pkg_install/files/delete/main.c +++ b/pkgtools/pkg_install/files/delete/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2004/01/14 23:55:29 jlam Exp $ */ +/* $NetBSD: main.c,v 1.11 2004/03/29 02:24:11 tv Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #if 0 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp"; #else -__RCSID("$NetBSD: main.c,v 1.10 2004/01/14 23:55:29 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.11 2004/03/29 02:24:11 tv Exp $"); #endif #endif @@ -184,9 +184,11 @@ main(int argc, char **argv) warnx("missing package name(s)"); usage(); } +#ifndef __INTERIX if (!Fake && getuid() != 0) { warnx("not running as root - trying to delete anyways"); } +#endif if (OnlyDeleteFromPkgDB) { /* Only delete the given packages' files from pkgdb, do not * touch the pkg itself. Used by "make reinstall" in |