*** ./src/fonts/Makefile	Mon May 31 16:49:27 1993
--- ../mm2.7/./src/fonts/Makefile	Tue Jun  9 13:56:29 1998
***************
*** 3,8 ****
--- 3,10 ----
  FONTSUFFIX=pcf
  FONTMAKER=bdfto${FONTSUFFIX}
  DIRBUILDER=mkfontdir
+ SHELL=/bin/sh
+ FONTDIR=
  
  # For Openwindows, you need to set FONTSUFFIX to fb and 
  # DIRBUILDER to bldfamily and
***************
*** 28,38 ****
  	-${DIRBUILDER}
  
  shownonascii: Xshownonascii
! 	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
  	chmod +x shownonascii
  
  mailto-hebrew: Xmailto-hebrew
! 	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
  	chmod +x mailto-hebrew
  
  clean:
--- 30,42 ----
  	-${DIRBUILDER}
  
  shownonascii: Xshownonascii
! 	fontdir="${FONTDIR}" && if [ -z "$$fontdir" ]; then fontdir=`pwd`; fi && \
! 	sed -e s@/u/nsb/lib/fonts@$${fontdir}@ < Xshownonascii > shownonascii
  	chmod +x shownonascii
  
  mailto-hebrew: Xmailto-hebrew
! 	fontdir="${FONTDIR}" && if [ -z "$$fontdir" ]; then fontdir=`pwd`; fi && \
! 	sed -e s@/u/nsb/lib/fonts@$${fontdir}@ < Xmailto-hebrew > mailto-hebrew
  	chmod +x mailto-hebrew
  
  clean:
*** ./src/config.h	Wed Nov 24 10:36:07 1993
--- ../mm2.7/./src/config.h	Tue Jun  9 14:57:02 1998
***************
*** 92,97 ****
--- 92,101 ----
  /* #define RESET_PROGRAM "tput clear" */
  /* #define RESET_PROGRAM "/bin/reset" */
  /* #define RESET_PROGRAM "/usr/ucb/reset" */
+ 
+ /* This macro was in SYSV section below, but it is only used in */
+ /* contrib/mms/hpux.c and it breaks SGI builds. */ 
+ #define killpg(a, b) kill(-(a), (b))
  #endif
  
  #ifdef NeXT
***************
*** 100,106 ****
  #endif
  
  #ifdef SYSV
- #define killpg(a, b) kill(-(a), (b))
  #define bcopy(a, b, c) memcpy(b, a, c)
  #define bzero(a, b) memset(a, 0, b)
  #define bcmp memcmp
--- 104,109 ----
***************
*** 173,179 ****
  #else
  #define PATH_SEPARATOR ':'
  #ifndef STDPATH
! #define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
  #endif
  #endif
  #endif
--- 176,182 ----
  #else
  #define PATH_SEPARATOR ':'
  #ifndef STDPATH
! #define STDPATH "/.mailcap:/var/netscape/communicator/mailcap:/usr/local/lib/netscape/mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap:/usr/freeware/etc/mailcap"
  #endif
  #endif
  #endif