*** sh.func.c.bak	Sat Oct  5 21:39:10 1996
--- sh.func.c	Mon Dec 16 04:25:04 1996
***************
*** 1312,1319 ****
  # ifdef LC_COLLATE
  	(void) setlocale(LC_COLLATE, "");
  # endif
! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
  	(void) setlocale(LC_MESSAGES, "");
  	(void) catclose(catd);
  	nlsinit();
  # endif /* NLS_CATALOGS && LC_MESSAGES */
--- 1312,1321 ----
  # ifdef LC_COLLATE
  	(void) setlocale(LC_COLLATE, "");
  # endif
! # ifdef NLS_CATALOGS
! # ifdef LC_MESSAGES
  	(void) setlocale(LC_MESSAGES, "");
+ # endif
  	(void) catclose(catd);
  	nlsinit();
  # endif /* NLS_CATALOGS && LC_MESSAGES */
***************
*** 1475,1482 ****
  # ifdef LC_COLLATE
  		    (void) setlocale(LC_COLLATE, "");
  # endif
! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
  		    (void) setlocale(LC_MESSAGES, "");
  		    (void) catclose(catd);
  		    nlsinit();
  # endif /* NLS_CATALOGS && LC_MESSAGES */
--- 1477,1486 ----
  # ifdef LC_COLLATE
  		    (void) setlocale(LC_COLLATE, "");
  # endif
! # ifdef NLS_CATALOGS
! # ifdef LC_MESSAGES
  		    (void) setlocale(LC_MESSAGES, "");
+ # endif
  		    (void) catclose(catd);
  		    nlsinit();
  # endif /* NLS_CATALOGS && LC_MESSAGES */
--- Makefile.in	1997/10/24 15:41:23	1.1
+++ Makefile.in	1997/10/24 15:41:34
@@ -261,7 +261,7 @@
 PARALLEL=12				# Make the multi-max run fast.
 #P=&					# Use Sequent's parallel make
 P=
-DESTDIR=/usr/local
+DESTDIR=@prefix@
 MANSECT=1
 DESTBIN=${DESTDIR}/bin
 DESTMAN=${DESTDIR}/man/man${MANSECT}