--- Makefile.defs.in.orig	Sun Sep 17 10:14:42 1995
+++ Makefile.defs.in	Sat Nov 29 01:24:36 1997
@@ -78,15 +78,17 @@
 
 
 # optimization flag -- may become host dependent
-OPT_FLAG = -O
+#OPT_FLAG = -O
 CDEBUG = @CDEBUG@
 USER_OBJECTS = @USER_OBJECTS@
 
 #INCLUDES = @includeopt@
+USER_INCLUDES = -I${PREFIX}/include
 INCLUDES= -I.. -I$(srcdir) -I$(srcdir)/../lib $(USER_INCLUDES)
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@ # $(INCLUDES)
 LDPATH = @LDPATH@ 
+USER_LDFLAGS = -L${PREFIX}/lib
 LDFLAGS = @LDFLAGS@ $(USER_LDFLAGS)
 GCC_EXTRA_FLAGS = @GCC_EXTRA_FLAGS@ 
 # ICC_EXTRA_FLAGS = /c /Fo$@ /D__EXTENDED__  # flags for ICC
@@ -114,7 +116,7 @@
 # Where to put the system-wide image file
 libdir = $(prefix)/lib
 smlibdir = $(libdir)/smalltalk
-stdir = $(prefix)/smalltalk
+stdir = $(libdir)/smalltalk
 
 ## Where to put the manual pages.
 #mandir = $(prefix)/man
