*** Makefile	Tue Dec 13 13:14:48 1994
--- Makefile.new	Wed Jan 25 07:41:41 1995
***************
*** 100,115 ****
  #INC2 = -I/sim/usr/include
  
  #install directory locations
! INSTALL_INCLUDE = /usr/include
! INSTALL_LIBS = /usr/lib
  
  #for shipping
! CFLAGS = -DASM_SETJMP -DNOERR_CHECK -DSTACK_CHECK -DSIGNAL_STACK
  #for maximum portability (minimum assembly required)
  #CFLAGS = -DCLEANUP_HEAP -DC_CONTEXT_SWITCH
  #for thread-safe malloc and round-robin scheduling option
! #CFLAGS = -DASM_SETJMP -DNOERR_CHECK -DSTACK_CHECK -DSIGNAL_STACK \
! 	-DMALLOC -DDEF_RR
  #for GNARL project
  #CFLAGS = -DASM_SETJMP -DSTACK_CHECK -DSIGNAL_STACK -DDRAFT5
  #for VME SPARC Engine 1E running SunOS 4.0.3e
--- 100,117 ----
  #INC2 = -I/sim/usr/include
  
  #install directory locations
! INSTALL_INCLUDE = /usr/local/fsu-pthreads-2.4/include
! INSTALL_LIBS = /usr/local/fsu-pthreads-2.4/lib
! #INSTALL_INCLUDE = /usr/include
! #INSTALL_LIBS = /usr/lib
  
  #for shipping
! #CFLAGS = -DASM_SETJMP -DNOERR_CHECK -DSTACK_CHECK -DSIGNAL_STACK
  #for maximum portability (minimum assembly required)
  #CFLAGS = -DCLEANUP_HEAP -DC_CONTEXT_SWITCH
  #for thread-safe malloc and round-robin scheduling option
! CFLAGS = -DASM_SETJMP -DNOERR_CHECK -DSTACK_CHECK -DSIGNAL_STACK \
! 	-DMALLOC -DDEF_RR -DNEXUS
  #for GNARL project
  #CFLAGS = -DASM_SETJMP -DSTACK_CHECK -DSIGNAL_STACK -DDRAFT5
  #for VME SPARC Engine 1E running SunOS 4.0.3e
***************
*** 122,128 ****
  CFLAGS += -DSRP -DC_INTERFACE
  
  #for non-process blocking (only thread-blocking) I/O:
! #CFLAGS += -DIO
  
  #for shipping
  CCFLAGS = -O3 $(CFLAGS)
--- 124,130 ----
  CFLAGS += -DSRP -DC_INTERFACE
  
  #for non-process blocking (only thread-blocking) I/O:
! CFLAGS += -DIO
  
  #for shipping
  CCFLAGS = -O3 $(CFLAGS)
*** io.c	Tue Dec 13 13:14:49 1994
--- io.c.new	Wed Jan 25 09:23:10 1995
***************
*** 318,323 ****
--- 318,324 ----
      (*l).fds_bits [i] = (*l).fds_bits [i] | (*r).fds_bits [i];
  }
  
+ #ifndef NEXUS
  /*------------------------------------------------------------*/
  /*
   * select - Same as BSD select except that it blocks only the current thread
***************
*** 382,387 ****
--- 383,389 ----
    pthread_fds_set(exceptfds, &(p->exceptfds));
    return(p->how_many);
  }
+ #endif !NEXUS
  #endif !SVR4
  
  /*------------------------------------------------------------*/
*** pthread_aux.S	Tue Dec 13 13:14:50 1994
--- pthread_aux.S.new	Tue Jan 24 11:45:10 1995
***************
*** 121,126 ****
--- 121,127 ----
  	ta	ST_FLUSH_WINDOWS	! Delay:Flush Windows(no save/restore)
  #endif STACK_CHECK && SIGNAL_STACK
  
+ #ifndef NEXUS
  !	void start_float()
  !
  !	Solaris provides the "init" section for initialization routines.
***************
*** 154,159 ****
--- 155,161 ----
  	ret
  	restore
  #endif !SOLARIS
+ #endif !NEXUS
  
  #ifdef SOLARIS
  !	void pthread_dummy()