Index: lib/libc/locale/collate.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/locale/collate.c,v
retrieving revision 1.4.4.2
diff -c -r1.4.4.2 collate.c
*** collate.c	1996/06/05 02:47:55	1.4.4.2
--- collate.c	1997/02/05 10:21:59
***************
*** 64,70 ****
  	__collate_load_error = 1;
  	if (!encoding)
  		return -1;
! 	if (!path_locale && !(path_locale = getenv("PATH_LOCALE")))
  		path_locale = _PATH_LOCALE;
  	strcpy(buf, path_locale);
  	strcat(buf, "/");
--- 64,70 ----
  	__collate_load_error = 1;
  	if (!encoding)
  		return -1;
! 	if (!path_locale)
  		path_locale = _PATH_LOCALE;
  	strcpy(buf, path_locale);
  	strcat(buf, "/");
Index: lib/libc/locale/rune.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/locale/rune.c,v
retrieving revision 1.2.6.3
diff -c -r1.2.6.3 rune.c
*** rune.c	1996/06/05 02:47:59	1.2.6.3
--- rune.c	1997/02/05 10:22:00
***************
*** 71,77 ****
  		return(0);
  	}
  
! 	if (!PathLocale && !(PathLocale = getenv("PATH_LOCALE")))
  		PathLocale = _PATH_LOCALE;
  
  	(void) strcpy(name, PathLocale);
--- 71,77 ----
  		return(0);
  	}
  
! 	if (!PathLocale)
  		PathLocale = _PATH_LOCALE;
  
  	(void) strcpy(name, PathLocale);
Index: lib/libc/locale/setlocale.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/locale/setlocale.c,v
retrieving revision 1.3.4.2.2.1
diff -c -r1.3.4.2.2.1 setlocale.c
*** setlocale.c	1996/06/05 02:48:03	1.3.4.2.2.1
--- setlocale.c	1997/02/05 10:22:00
***************
*** 58,64 ****
  	int found, i, len;
  	char *env, *r;
  
! 	if (!PathLocale && !(PathLocale = getenv("PATH_LOCALE")))
  		PathLocale = _PATH_LOCALE;
  
  	if (category < 0 || category >= _LC_LAST)
--- 58,64 ----
  	int found, i, len;
  	char *env, *r;
  
! 	if (!PathLocale)
  		PathLocale = _PATH_LOCALE;
  
  	if (category < 0 || category >= _LC_LAST)
Index: lib/libc/locale/startup_setlocale.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/locale/Attic/startup_setlocale.c,v
retrieving revision 1.2.4.2
diff -c -r1.2.4.2 startup_setlocale.c
*** startup_setlocale.c	1995/08/28 05:06:50	1.2.4.2
--- startup_setlocale.c	1997/02/05 10:22:00
***************
*** 23,29 ****
  	int found, i, len;
  	char *env, *r;
  
! 	if (!PathLocale && !(PathLocale = getenv("PATH_LOCALE")))
  		PathLocale = _PATH_LOCALE;
  
  	if (category < 0 || category >= _LC_LAST)
--- 23,29 ----
  	int found, i, len;
  	char *env, *r;
  
! 	if (!PathLocale)
  		PathLocale = _PATH_LOCALE;
  
  	if (category < 0 || category >= _LC_LAST)