*** sim/spice/common/conf/defaults.orig	Sat Jan 29 19:15:53 1994
--- sim/spice/common/conf/defaults	Sun Dec 12 14:40:09 1999
***************
*** 105,116 ****
  #	identified as and SYSTEM is the name of the per-system definitions
  #	file listed on the "build" command line.
  
! SPICE_DIR	= $(TOP1)/$(SYSTEM)
! SPICE_LIB_DIR	= $(SPICE_DIR)/lib
  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
  
  S_SPICE_DIR	= $(SPICE_DIR)
! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  
  #	INSTALL_DIRS lists the directories that need to be created before
--- 105,116 ----
  #	identified as and SYSTEM is the name of the per-system definitions
  #	file listed on the "build" command line.
  
! SPICE_DIR	= ${PREFIX}
! SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
  
  S_SPICE_DIR	= $(SPICE_DIR)
! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  
  #	INSTALL_DIRS lists the directories that need to be created before
*** sim/spice/common/util/build.orig	Sat Jan 29 19:16:26 1994
--- sim/spice/common/util/build	Sun Dec 12 14:38:33 1999
***************
*** 96,102 ****
  
  TMP_LEADER="${TMP_DIR}/buildl$$"
  TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15
  echo > "${TMP_TRAILER}"
  BAD=false
  DEBUG=
--- 96,102 ----
  
  TMP_LEADER="${TMP_DIR}/buildl$$"
  TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15
  echo > "${TMP_TRAILER}"
  BAD=false
  DEBUG=