--- a/Make.proto	Mon Nov 29 12:50:06 1999 +0100
+++ b/Make.proto	Wed Dec 01 17:32:54 1999 +0100
@@ -33,6 +33,15 @@
 TOP=../..
 SUBDIRS=
 SUPPRESS_LOCAL_ABBREVS="yes"
+#
+# these are installed when installing their
+# package dir ...
+#
+SUPPRESS_INSTALL_BITMAPS="yes"
+SUPPRESS_INSTALL_RESOURCES="yes"
+
+INSTALLBIN_DIR=$(INSTALLBASE)/bin
+INSTALLLIB_DIR=$(INSTALLBASE)/lib
 
 RCSSOURCES=*.rc patches Make.proto
 LINKSOURCES=*.rc patches Make.proto
@@ -505,71 +514,12 @@
 
 main.o::    $(INCLUDE)/stc.h $(INCLUDE)/stcIntern.h Makefile $(INCLUDE)/symbols.stc symbols.h
 
-#
-# installation rules
-#
-
-install:: installThis
-
-#
-# install binary only
-#
-binInstall::
-	test -d $(INSTALLBIN_DIR) || mkdir $(INSTALLBIN_DIR)
-	$(INSTALL_BIN_CMD) smalltalk $(INSTALLBIN_DIR)
+installProgsIf:: $(INSTALLBIN_DIR)
+	$(INSTALL_SCRIPT_CMD) smalltalk $(INSTALLBIN_DIR)
 	$(INSTALL_BIN_CMD) stx $(INSTALLBIN_DIR)
 	-strip $(INSTALLBIN_DIR)/stx
 
-installThisSources:
-	test -d $(INSTALLLIB_DIR)/source || mkdir $(INSTALLLIB_DIR)/source
-	-chmod a+rx $(INSTALLLIB_DIR)/source
-	-cp source/[A-G]* $(INSTALLLIB_DIR)/source
-	-cp source/[H-P]* $(INSTALLLIB_DIR)/source
-	-cp source/[Q-Z]* $(INSTALLLIB_DIR)/source
-	-chmod a+r $(INSTALLLIB_DIR)/source/[A-G]*
-	-chmod a+r $(INSTALLLIB_DIR)/source/[H-P]*
-	-chmod a+r $(INSTALLLIB_DIR)/source/[Q-Z]*
-
-installThisBitmaps:
-	test -d $(INSTALLLIB_DIR)/bitmaps || mkdir $(INSTALLLIB_DIR)/bitmaps
-	-chmod a+rx $(INSTALLLIB_DIR)/bitmaps
-	-cp bitmaps/[A-I]* $(INSTALLLIB_DIR)/bitmaps
-	-cp bitmaps/[J-Z]* $(INSTALLLIB_DIR)/bitmaps
-	-cp bitmaps/[a-i]* $(INSTALLLIB_DIR)/bitmaps
-	-cp bitmaps/[j-z]* $(INSTALLLIB_DIR)/bitmaps
-	-chmod a+r $(INSTALLLIB_DIR)/bitmaps/[A-I]*
-	-chmod a+r $(INSTALLLIB_DIR)/bitmaps/[J-Z]*
-	-chmod a+r $(INSTALLLIB_DIR)/bitmaps/[a-i]*
-	-chmod a+r $(INSTALLLIB_DIR)/bitmaps/[j-z]*
+installAux:: installRCScripts
 
-installThisResources:
-	-chmod a+rx $(INSTALLLIB_DIR)/resources
-	test -d $(INSTALLLIB_DIR)/resources || mkdir $(INSTALLLIB_DIR)/resources
-	-cp resources/* $(INSTALLLIB_DIR)/resources
-	-chmod a+r $(INSTALLLIB_DIR)/resources/*.rs
-
-installRest:
-	test -d $(INSTALLLIB_DIR)/doc || mkdir $(INSTALLLIB_DIR)/doc
-	test -d $(INSTALLLIB_DIR)/doc/online || mkdir $(INSTALLLIB_DIR)/doc/online
-	test -d $(INSTALLLIB_DIR)/doc/online/english || mkdir $(INSTALLLIB_DIR)/doc/online/english
-	-chmod a+rx $(INSTALLLIB_DIR)/doc
-	-chmod a+rx $(INSTALLLIB_DIR)/doc/online
-	-chmod a+rx $(INSTALLLIB_DIR)/doc/online/english
-	-cp $(TOP)/doc/online/english/LICENCE_STX.html $(INSTALLLIB_DIR)/doc/online/english
-	-cp $(TOP)/doc/online/english/*.tiff $(INSTALLLIB_DIR)/doc/online/english
-	-chmod a+r $(INSTALLLIB_DIR)/doc/online/english/*
-
-#
-# install all local stuff
-#
-# notice the [x-y]* patterns; some unixes (at&t) dont like too many arguments ...
-#
-installThis:: binInstall installRest
-	test -d $(INSTALLLIB_DIR) || mkdir $(INSTALLLIB_DIR)
-	$(MAKE) installThisSources
-	$(MAKE) installThisBitmaps
-	$(MAKE) installThisResources
-	-cp *.rc *.stc patches $(INSTALLLIB_DIR)
-	-chmod a+r $(INSTALLLIB_DIR)/*.rc $(INSTALLLIB_DIR)/*.stc $(INSTALLLIB_DIR)/patches
-
-qinstall:: installThis
+installRCScripts::
+	$(INSTALL_AUX_CMD) *.rc $(INSTALLLIB_DIR)

--- a/smalltalk	Mon Nov 29 12:50:06 1999 +0100
+++ b/smalltalk	Wed Dec 01 17:32:54 1999 +0100
@@ -131,8 +131,8 @@
 then
     if [ "$STX_LIBDIR" != "/usr/local/smalltalk" ]
     then
-	LD_LIBRARY_PATH=$STX_LIBDIR/lib:$LD_LIBRARY_PATH
-	SHLIB_PATH=$STX_LIBDIR/lib:$SHLIB_PATH
+	LD_LIBRARY_PATH=$STX_LIBDIR:$STX_LIBDIR/lib:$LD_LIBRARY_PATH
+	SHLIB_PATH=$STX_LIBDIR:$STX_LIBDIR/lib:$SHLIB_PATH
     fi
 fi