usr.bin/make remove unwanted feature?
This is a multi-part message in MIME format.
--------------070302030306000806010108
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Hey Matt,
Do we want to keep this feature? If not here is a patch to
remove it.
Max
Date: 2001/04/25 15:44:41
Author: ru
Log:
unifdef -UWANT_ENV_PWD.
No one ever going to use this bugfeature.
Members:
main.c:1.48->1.49
make.1:1.42->1.43
--------------070302030306000806010108
Content-Type: text/plain;
name="patch-4.11"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-4.11"
---------------------
PatchSet 196
Date: 2001/04/25 15:44:41
Author: ru
Log:
unifdef -UWANT_ENV_PWD.
No one ever going to use this bugfeature.
Members:
main.c:1.48->1.49
make.1:1.42->1.43
Index: main.c
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- main.c 25 Apr 2001 14:22:38 -0000 1.48
+++ main.c 25 Apr 2001 14:44:41 -0000 1.49
@@ -455,10 +455,6 @@
Boolean outOfDate = TRUE; /* FALSE if all targets up to date */
struct stat sa;
char *p, *p1, *path, *pathp;
-#ifdef WANT_ENV_PWD
- struct stat sb;
- char *pwd;
-#endif
char mdpath[MAXPATHLEN];
char obpath[MAXPATHLEN];
char cdpath[MAXPATHLEN];
@@ -491,7 +487,7 @@
}
#endif
/*
- * Find where we are and take care of PWD for the automounter...
+ * Find where we are...
* All this code is so that we know where we are when we start up
* on a different machine with pmake.
*/
@@ -502,13 +498,5 @@
if (stat(curdir, &sa) == -1)
err(2, "%s", curdir);
-#ifdef WANT_ENV_PWD
- if ((pwd = getenv("PWD")) != NULL) {
- if (stat(pwd, &sb) == 0 && sa.st_ino == sb.st_ino &&
- sa.st_dev == sb.st_dev)
- (void) strcpy(curdir, pwd);
- }
-#endif
-
#if defined(__i386__) && defined(__DragonFly_version)
/*
@@ -617,10 +605,6 @@
if (!(objdir = chdir_verify_path(mdpath, obpath)))
objdir = curdir;
}
-
-#ifdef WANT_ENV_PWD
- setenv("PWD", objdir, 1);
-#endif
create = Lst_Init(FALSE);
makefiles = Lst_Init(FALSE);
Index: make.1
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/make.1,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- make.1 18 Feb 2001 10:43:32 -0000 1.42
+++ make.1 25 Apr 2001 14:44:42 -0000 1.43
@@ -518,6 +518,12 @@
.Nm
is unable to change into any of the remaining three directories,
then the current directory is used.
+.Pp
+.Nm
+sets
+.Va .OBJDIR
+to the canonical path given by
+.Xr getcwd 3 .
.It Va .MAKEFILE_LIST
As
.Nm
@@ -526,29 +537,6 @@
A synonym for
.Va .MAKEFLAGS
provided for backward compatibility.
-.It Ev PWD
-Alternate path to the current directory.
-Supported if built with WANT_ENV_PWD defined.
-.Nm
-normally sets
-.Ql Va .CURDIR
-to the canonical path given by
-.Xr getcwd 3 .
-However, if the environment variable
-.Ev PWD
-is set and gives a path to the current directory, then
-.Nm
-sets
-.Ql Va .CURDIR
-to the value of
-.Ev PWD
-instead.
-.Ev PWD
-is always set to the value of
-.Ql Va .OBJDIR
-for all programs which
-.Nm
-executes.
.It Va .TARGETS
List of targets
.Nm
@@ -1172,9 +1160,8 @@
.Ev MAKE ,
.Ev MAKEFLAGS ,
.Ev MAKEOBJDIR ,
-.Ev MAKEOBJDIRPREFIX ,
and
-.Ev PWD .
+.Ev MAKEOBJDIRPREFIX .
.Sh FILES
.Bl -tag -width /usr/share/doc/psd/12.make -compact
.It Pa .depend
--------------070302030306000806010108--