Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -49,11 +49,11 @@ MOFILES = $(MSRCFILES:%.scm=%.o) -%.o : %.scm ../adat.scm +%.o : %.scm ../adat.scm $(MTEGGS) csc $(CSCOPTS) -J -c $< -o $*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) @@ -62,11 +62,11 @@ MT_EGGS_BASE=$(PREFIX)/eggs MT_EGGS_DIR=$(MT_EGGS_BASE)/lib/chicken/7 MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so CHICKEN_REPOSITORY=$(MT_EGGS_DIR) export CHICKEN_REPOSITORY -CSCOPTS=-Wl,-rpath,$(MT_EGGS_DIR) +#CSCOPTS=-Wl,-rpath,$(MT_EGGS_DIR) # prefix commands with $(withenv) following as a means to collect env vars for compilation... withenv=CHICKEN_REPOSITORY=$(MT_EGGS_DIR) @@ -195,11 +195,11 @@ tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm megatest.o : megatest-fossil-hash.scm -rmt.scm client.scm common.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm +rmt.scm client.scm common.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm $(MTEGGS) common_records.scm : altdb.scm vg.o dashboard.o : vg_records.scm dcommon.o : run_records.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -67,10 +67,13 @@ ;;(declare (uses mtconfigf)) (use (prefix mtconfigf configf:)) +;;(configf:add-eval-string "(use common)") + + (include "common_records.scm") ;; (require-library margs) Index: utils/mk_wrapper ================================================================== --- utils/mk_wrapper +++ utils/mk_wrapper @@ -28,13 +28,10 @@ if [[ -z \$LD_LIBRARY_PATH ]];then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH else export LD_LIBRARY_PATH=$LD_LIBRARY_PATH fi -if [[ -z \$CHICKEN_REPOSITORY ]];then - export CHICKEN_REPOSITORY=$prefix/eggs/chicken/lib/7 -fi __EOF ) > $cfgfile echo else echo "INFO: LD_LIBRARY_PATH not set" >&2