diff options
| author | tv <tv@pkgsrc.org> | 2005-01-05 21:54:40 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-05 21:54:40 +0000 |
| commit | ab5739886fb4daf30c8822fb252e93140352be87 (patch) | |
| tree | 21d4a51351543b30698b80eeb6fc8c10c37be616 /bootstrap/bmake | |
| parent | 16a4e83435bd0bfc7280ea6484d8f30882876b18 (diff) | |
| download | pkgsrc-ab5739886fb4daf30c8822fb252e93140352be87.tar.gz | |
Add temporary Interix-only hack: don't set the MAKEFILE variable based on
what files exist in the fs.
This works around a problem that crops up when using a nfs-mounted pkgsrc
repository under Interix. (When going to "su" during the install phase,
bmake sees "makefile" for a moment in lieu of "Makefile", and all hell
breaks loose.)
Diffstat (limited to 'bootstrap/bmake')
| -rw-r--r-- | bootstrap/bmake/main.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/bootstrap/bmake/main.c b/bootstrap/bmake/main.c index 4de0cede325..c331b7a66d9 100644 --- a/bootstrap/bmake/main.c +++ b/bootstrap/bmake/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $ */ +/* $NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -39,7 +39,7 @@ */ #ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -51,13 +51,13 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $"); +__RCSID("$NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $"); #endif #endif /* not lint */ #endif #if !defined(MAKE_BOOTSTRAP) && !defined(lint) -__IDSTRING(rcs_id,"$Id: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $"); +__IDSTRING(rcs_id,"$Id: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $"); #endif /*- @@ -1032,7 +1032,16 @@ ReadMakefile(p, q) Parse_File("(stdin)", stdin); Var_Set("MAKEFILE", "", VAR_GLOBAL, 0); } else { +#ifdef __INTERIX + /* XXX tv: Hack pending a fix to bsd.pkg.mk to use some other + variable name than this. When using a NFS pkgsrc repository, + bmake thinks "makefile" exists when running under "su" even + though the filesystem is mounted case-sensitive on the + non-su side. This hoses all sorts of fun things. */ + setMAKEFILE = FALSE; +#else setMAKEFILE = strcmp(fname, ".depend"); +#endif /* if we've chdir'd, rebuild the path name */ if (curdir != objdir && *fname != '/') { |