Pass CFG_{RUNTIME,INSTALL}_SCRDIR to tclInterp.c

Author: apnadkarni

generic/tclInterp.c

@@ -407,7 +407,7 @@ LocatePreInitScript(Tcl_Interp *interp)
     /*
      * Need to track checked directories for error reporting. As a side
      * benefit, because they are tracked here we can keep overwriting dirPtr
-     * without leaking memory.
+     * without leaking memory despite not freeing up any allocated Tcl_Obj's.
      */
     searchedDirs = Tcl_NewListObj(0, NULL);
 
@@ -454,6 +454,9 @@ LocatePreInitScript(Tcl_Interp *interp)
 #ifdef CFG_RUNTIME_SCRDIR
 	TRY_PATH(Tcl_NewStringObj(CFG_RUNTIME_SCRDIR, -1));
 #endif
+#ifdef CFG_INSTALL_SCRDIR
+	TRY_PATH(Tcl_NewStringObj(CFG_INSTALL_SCRDIR, -1));
+#endif
 
     assert(initScriptPathPtr == NULL);
 

unix/Makefile.in

@@ -1398,7 +1398,14 @@ tclIndexObj.o: $(GENERIC_DIR)/tclIndexObj.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIndexObj.c
 
 tclInterp.o: $(GENERIC_DIR)/tclInterp.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclInterp.c
+	$(CC) -c $(CC_SWITCHES) \
+		-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR)\"" \
+		-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR)\"" \
+		-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR)\"" \
+		-DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
+		-DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \
+		-DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY)\"" \
+		$(GENERIC_DIR)/tclInterp.c
 
 tclIO.o: $(GENERIC_DIR)/tclIO.c $(IOHDR)
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIO.c