--- a/Make.proto	Thu Oct 23 18:21:12 2003 +0200
+++ b/Make.proto	Sun Oct 26 17:27:46 2003 +0100
@@ -155,7 +155,7 @@
 
 mySmalltalk: $(MY_ADDITIONAL_OBJECTS)
 	@echo "making special smalltalk ..."
-	@$(MAKE) linkIt \
+	@$(MAKE) linkTarget \
 		LIBOBJS="$(LIBOBJS)" \
 		LINK_OBJS="$(LINK_OBJS)" \
 		LINK_LIBOBJS="$(LINK_LIBOBJS)" \
@@ -176,7 +176,7 @@
 #
 $(TARGET)_static: $(STATIC_LIBRUN)
 	@echo "making statically linked smalltalk ..."
-	@$(MAKE) linkIt \
+	@$(MAKE) linkTarget \
 		LIBOBJS="" \
 		LINK_OBJS="$(STATIC_OBJS)" \
 		LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
@@ -191,7 +191,7 @@
 
 $(TARGET)_shared:
 	@echo "making shared library linked smalltalk ..."
-	@$(MAKE) linkIt \
+	@$(MAKE) linkTarget \
 		LIBOBJS="$(LIBOBJS)" \
 		ADDITIONAL_OBJS=$(ADDITIONAL_OBJS) \
 		ADDITIONAL_CLASSES=$(ADDITIONAL_CLASSES) \
@@ -208,7 +208,7 @@
 	    (cd $(LIBRUNDIR); $(MAKE) librun.a); \
 	fi
 	@echo "making full statically linked smalltalk ..."
-	@$(MAKE) linkIt \
+	@$(MAKE) linkTarget \
 		LIBOBJS="" \
 		LINK_OBJS="$(STATIC_OBJS)" \
 		LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
@@ -240,7 +240,7 @@
 
 aix:
 	    @echo "making shared library linked smalltalk for aix ..."
-	    @$(MAKE) linkIt \
+	    @$(MAKE) linkTarget \
 		LIBOBJS="$(AIX_SHARED_LIBOBJS)" \
 		EXTRA_OBJ="$(EXTRA_OBJ)" \
 		EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
@@ -250,12 +250,12 @@
 
 aix_librun_only:
 	    @echo "making partial shared library linked smalltalk ..."
-	    @$(MAKE) linkIt LIBRUN=$(LIBRUNDIR)/librun.so
+	    @$(MAKE) linkTarget LIBRUN=$(LIBRUNDIR)/librun.so
 
 forceStatic:
 	    (cd $(LIBBASICDIR) ; $(MAKE) libbasicInit.o)
 	    -rm -f $(LIBBASICDIR)/libbasic.o
-	    $(MAKE) linkIt LIBRUN="$(LIBRUNDIR)/*.o" LIBBASIC="$(LIBBASICDIR)/*.o"
+	    $(MAKE) linkTarget LIBRUN="$(LIBRUNDIR)/*.o" LIBBASIC="$(LIBBASICDIR)/*.o"
 
 $(LIBVIEWDIR)/XWorkstation.o:
 	(cd $(LIBVIEWDIR) ; $(MAKE) XWorkstation.o)

--- a/smalltalk.rc	Thu Oct 23 18:21:12 2003 +0200
+++ b/smalltalk.rc	Sun Oct 26 17:27:46 2003 +0100
@@ -252,22 +252,19 @@
 "/ and install all nonExisting classes as autoloaded
 "/
 
-"/
-"/ no need to autoload from smalltalk.rc, because it`s done internally at startup
-"/
-"/Class withoutUpdatingChangesDo:[ 
-"/    |needToReactivate|
-"/
-"/    HistoryManager notNil ifTrue:[
-"/        needToReactivate := HistoryManager isActive.
-"/        HistoryManager deactivate.
-"/    ] ifFalse:[
-"/        needToReactivate := false
-"/    ].
-"/    'smalltalk.rc [info]: installing autoloaded classes ...' infoPrintCR.
-"/    Smalltalk installAutoloadedClasses.
-"/    needToReactivate ifTrue:[HistoryManager activate].
-"/].
+Class withoutUpdatingChangesDo:[ 
+    |needToReactivate|
+
+    HistoryManager notNil ifTrue:[
+	needToReactivate := HistoryManager isActive.
+	HistoryManager deactivate.
+    ] ifFalse:[
+	needToReactivate := false
+    ].
+    'smalltalk.rc [info]: installing autoloaded classes ...' infoPrintCR.
+    Smalltalk installAutoloadedClasses.
+    needToReactivate ifTrue:[HistoryManager activate].
+].
 
 buildClasses ifTrue:[
     "/