Correct paths in moxerverctl and adapt Makefiles

tools/Makefile

@@ -5,9 +5,9 @@ TARGET_CONFIG = moxerver.cfg
 # ==============================================================================
 
 # directory for build results
-BUILDDIR = build.dir
+BUILDDIR = $(abspath build.dir)
 # installation root
-INSTALLDIR = install.dir
+INSTALLDIR = $(abspath install.dir)
 # prefix for /bin directory
 BIN_PREFIX = /usr
 
@@ -21,12 +21,11 @@ default:
 
 # install targets
 install:
-	# install control script
-	mkdir -p $(INSTALLDIR)/$(BIN_PREFIX)/bin
-	cp $(TARGET_CONTROL) $(INSTALLDIR)/$(BIN_PREFIX)/bin/
 	# install configuration file
-	mkdir -p $(INSTALLDIR)/etc
-	cp $(TARGET_CONFIG) $(INSTALLDIR)/etc/
+	install -Dm0644 $(TARGET_CONFIG) $(INSTALLDIR)/etc/$(TARGET_CONFIG)
+	# install control script, referring to the configuration file
+	install -Dm0755 $(TARGET_CONTROL) $(INSTALLDIR)/$(BIN_PREFIX)/bin/$(TARGET_CONTROL)
+	sed -i -e 's#ROOT=\"\"#ROOT=$(INSTALLDIR)#' $(INSTALLDIR)/$(BIN_PREFIX)/bin/$(TARGET_CONTROL)
 
 # clean removes object files and target (ignore errors with "-" before commands)
 clean:

tools/moxerverctl

@@ -4,10 +4,12 @@
 # setup
 # =====
 
+ROOT=""
+
 # parameters
-CONFIGURATION_FILE="./moxanix.cfg"
-SERVER_BINARY="./moxerver"
-LOG_DIRECTORY="./logs"
+CONFIGURATION_FILE="$ROOT/etc/moxerver.cfg"
+SERVER_BINARY="moxerver"
+LOG_DIRECTORY="$ROOT/var/logs/moxerver"
 
 
 # global variables for configuration