From 40bc8c41cc73d58ad975d7bf218fcb698e944094 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Wed, 6 Sep 2017 18:40:49 +0200
Subject: Make 'install' too, which installs tools directory.

Stop moving the source dir to INSTDIR -- make install does what's
needed.

Use getconfig.sh in INSTDIR/tools/.
---
 catlfish-dev/Dockerfile | 5 +----
 catlfish-dev/start.sh   | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'catlfish-dev')

diff --git a/catlfish-dev/Dockerfile b/catlfish-dev/Dockerfile
index c07fd4e..421ba72 100644
--- a/catlfish-dev/Dockerfile
+++ b/catlfish-dev/Dockerfile
@@ -66,10 +66,7 @@ RUN make -C plop
 
 WORKDIR /usr/local/src
 RUN git clone https://git.nordu.net/catlfish.git
-RUN make -C catlfish PREFIX=/usr/local all release
-# Move source dir into installation dir, to make $CWD/../lib/ make
-# sense for escripts.
-RUN mv /usr/local/src/catlfish /usr/local/catlfish/src
+RUN make -C catlfish PREFIX=/usr/local all release install
 
 # Config dir is mounted from host using `-v' to 'docker run'.
 VOLUME /usr/local/etc/catlfish
diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index 8b3d04a..86a09e5 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -11,10 +11,7 @@ erlbase=$ERLANG_BASE_DIR
 # Use some reasonable default values.
 [ -z "$erlbase" ] && erlbase=/usr/local/catlfish
 
-# FIXME: Get getconfig.sh from the
-# $erlbase/lib/catlfish-$VERSION.ez (zip archive) instead of requiring
-# source code to be unpacked in the container.
-GETCONFIG=/usr/local/catlfish/src/tools/getconfig.sh
+GETCONFIG=/usr/local/catlfish/tools/getconfig.sh
 
 mkdir ${nodename}
 $GETCONFIG /usr/local/etc/catlfish/${nodename}.cfg ${logname}.cfg force-compile
-- 
cgit v1.1