Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -16,9 +16,11 @@ install-sh config.log config.status tweetnacl build/tweetnacl/out +build/tweetnacl/INST blake2b build/blake2b/out +build/blake2b/INST build/work build/tcl Index: autogen.sh ================================================================== --- autogen.sh +++ autogen.sh @@ -78,15 +78,11 @@ rm -rf autom4te.cache set -e # Assemble tweetnacl -make -C build/tweetnacl rm -rf tweetnacl -mkdir tweetnacl -cp build/tweetnacl/out/* tweetnacl/ +make -C build/tweetnacl install PREFIX="$(pwd)/tweetnacl" # Assemble blake2b -make -C build/blake2b rm -rf blake2b -mkdir blake2b -cp build/blake2b/out/* blake2b/ +make -C build/blake2b install PREFIX="$(pwd)/blake2b" Index: build/blake2b/Makefile ================================================================== --- build/blake2b/Makefile +++ build/blake2b/Makefile @@ -1,5 +1,7 @@ +PREFIX := $(shell pwd)/INST + all: out/blake2b.c out/blake2.h out/blake2-impl.h out/blake2b.c: src/blake2b-ref.c blake2-nacl.c mkdir -p out cat src/blake2b-ref.c blake2-nacl.c > out/blake2b.c @@ -10,12 +12,16 @@ out/blake2-impl.h: src/blake2-impl.h mkdir -p out cp src/blake2-impl.h out +install: out/blake2b.c out/blake2.h out/blake2-impl.h + mkdir -p '$(PREFIX)' + cp out/blake2b.c out/blake2.h out/blake2-impl.h '$(PREFIX)' + clean: rm -f out/blake2b.c out/blake2.h out/blake2-impl.h -rmdir out distclean: clean -.PHONY: all clean distclean +.PHONY: all install clean distclean Index: build/tweetnacl/Makefile ================================================================== --- build/tweetnacl/Makefile +++ build/tweetnacl/Makefile @@ -1,5 +1,7 @@ +PREFIX := $(shell pwd)/INST + all: out/tweetnacl.c out/tweetnacl.h tweetnacl.h.new: src/tweetnacl.h rm -f tweetnacl.h.new tweetnacl.h cp src/tweetnacl.h tweetnacl.h.new @@ -19,15 +21,19 @@ mv tweetnacl.c out out/tweetnacl.h: out/tweetnacl.c mv tweetnacl.h out +install: out/tweetnacl.c out/tweetnacl.h + mkdir -p '$(PREFIX)' + cp out/tweetnacl.c out/tweetnacl.h '$(PREFIX)' + clean: rm -f tweetnacl.c.new.orig tweetnacl.h.new.orig rm -f tweetnacl.h.new tweetnacl.h rm -f tweetnacl.c.new tweetnacl.c rm -f out/tweetnacl.c out/tweetnacl.h -rmdir out distclean: clean -.PHONY: all clean distclean +.PHONY: all install clean distclean