readme: update installation docs

Makefile

@@ -1,6 +1,4 @@
-CHICKEN_C ?= csc
-CHICKEN_INSTALL ?= chicken-install
-CHICKEN_STATUS ?= chicken-status
+CHICKEN_C = csc
 CSC_FLAGS += -K prefix -static
 # What and why:
 # -emit-all-import-libraries: Emit import-libraries for all defined modules.
@@ -13,6 +11,7 @@ CSC_FLAGS += -K prefix -static
 #    "during expansion of (import ...) - cannot import from undefined module: sex-macros"
 #     error.
 # -c: Stop after compilation to object files. This one is obvious.
+CHICKEN_INSTALL = chicken-install
 
 # GNU directory variables. Command line overrides, e.g.
 #   make prefix=$(HOME)/.local install
@@ -30,28 +29,22 @@ MODULES = utils types sex-macros reader sex-modules semen sex-fmt-c fmt-c-writer
 OBJ = $(MODULES:%=%.o)
 
 DEPSFILE = dependencies.txt
-DEPSLOCK = eggs.lock
-EGGS_DIR := $(abspath .eggs)
+DEPSLOCK = .eggs.lock
 
-# Compiler's own repository (types.db, chicken.*), ignoring ambient venv vars.
-SYSTEM_CHICKEN_REPO := $(shell env -u CHICKEN_INSTALL_REPOSITORY -u CHICKEN_REPOSITORY_PATH -u CHICKEN_EGG_CACHE -u CHICKEN_INSTALL_PREFIX $(CHICKEN_INSTALL) -repository 2>/dev/null)
-CHICKEN_ABI := $(notdir $(SYSTEM_CHICKEN_REPO))
-EGGS_STAMP := $(EGGS_DIR)/.installed-$(CHICKEN_ABI)
+DEPENDENCIES = $(shell cat $(DEPSFILE))
+CHICKEN_EXTERNAL_REPOSITORY := $(shell chicken-install -repository)
 
-export CHICKEN_EGG_CACHE := $(EGGS_DIR)/cache
-export CHICKEN_INSTALL_REPOSITORY := $(EGGS_DIR)
-export CHICKEN_INSTALL_PREFIX := $(EGGS_DIR)
-export CHICKEN_REPOSITORY_PATH := $(EGGS_DIR):$(SYSTEM_CHICKEN_REPO)
+export CHICKEN_EGG_CACHE=$(abspath .eggs)/cache
+export CHICKEN_REPOSITORY_PATH=$(abspath .eggs):$(CHICKEN_EXTERNAL_REPOSITORY)
+export CHICKEN_INSTALL_REPOSITORY=$(abspath .eggs)
 
 all: sexc
 
-sexc: $(EGGS_STAMP) $(OBJ) main.scm
+sexc: $(OBJ) main.scm
 	$(CHICKEN_C) $(CSC_FLAGS) main.scm -o sexc-tmp -link sexc
         # otherwise csc hangs, probably because it tries to compile to sexc.o first
 	mv sexc-tmp sexc
 
-$(OBJ): $(EGGS_STAMP)
-
 #------------------------------------------------------------------
 
 utils.o: utils.module.scm utils.scm
@@ -82,11 +75,11 @@ sexc.o: sexc.module.scm types.o sexc.scm fmt-c-writer.o sex-macros.o sex-modules
 	$(CHICKEN_C) $(CSC_FLAGS) $(MODULE_FLAGS) sexc.module.scm -o sexc.o -unit sexc -link fmt-c-writer,sex-macros,sex-modules,reader,semen,types,utils
 
 # Unit testing
-sex-tests: $(EGGS_STAMP)
+sex-tests:
 	$(MAKE) -C ./tests sex-tests
 	cp ./tests/sex-tests ./
 
-sextest: $(EGGS_STAMP)
+sextest:
 	$(MAKE) -C ./tools/sextest sextest
 	cp ./tools/sextest/sextest .
 
@@ -115,32 +108,22 @@ installdirs:
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/sexc
 
-# eggs.lock is the pin file (chicken-status -list). Install from it;
-# do not float versions on a normal build. Regenerating the lock:
-#   make deps-update
-$(EGGS_STAMP): $(DEPSLOCK)
-	mkdir -p $(CHICKEN_EGG_CACHE)
-	$(CHICKEN_INSTALL) -force -from-list $(DEPSLOCK)
-	touch $@
+run-tests: sex-tests
+	./sex-tests
 
-deps: $(EGGS_STAMP)
+.eggs.lock: $(DEPSFILE)
+	env | grep CHICKEN
+	$(CHICKEN_INSTALL) $(DEPENDENCIES)
+	touch $(DEPSLOCK)
 
-deps-update: $(DEPSFILE)
-	rm -rf $(EGGS_DIR)
-	mkdir -p $(CHICKEN_EGG_CACHE)
-	$(CHICKEN_INSTALL) -force $$(cat $(DEPSFILE))
-	CHICKEN_REPOSITORY_PATH=$(EGGS_DIR) $(CHICKEN_STATUS) -list | sort > $(DEPSLOCK).tmp
-	mv $(DEPSLOCK).tmp $(DEPSLOCK)
-	touch $(EGGS_STAMP)
+deps: $(DEPSLOCK)
 
 clean:
 	rm -f $(OBJ) main.o
 	rm -f *.import.scm
 	rm -f *.link
 	rm -f sexc sex-tests sextest
-	$(MAKE) -C ./tests clean
 	$(MAKE) -C ./tests/modules clean
-	$(MAKE) -C ./tools/sextest clean
 
 deps-clean:
 	rm -rf $(EGGS_DIR)

Readme.org

@@ -42,15 +42,11 @@ tree's ~.eggs~ path):
 #+end_src
 
 ** Installation
-GNU directory variables: ~prefix~, ~exec_prefix~, ~bindir~, ~DESTDIR~.
-
 #+begin_src sh
   # default installation (/usr/local/bin/)
   make install
-  # customize the prefix (installs to ~/.local/bin)
-  make prefix=$(HOME)/.local install
-  # staged install for packaging
-  make DESTDIR=/tmp/stage prefix=/usr install
+  # you can customize the prefix (will install to ~/.local/bin)
+  make prefix=~/.local install
 #+end_src
 
 * Usage