From a1162d167468e14652a95e0521e6eeacf54d7ae8 Mon Sep 17 00:00:00 2001
From: Igor Socec <igorsocec@gmail.com>
Date: Tue, 24 Jan 2017 20:40:57 +0100
Subject: [PATCH] Use a prefix when installing executables

---
 Makefile          | 7 +++++--
 moxanix/Makefile  | 6 ++++--
 moxerver/Makefile | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a490142..d349e17 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ MOXANIX = moxanix
 # system install root directory
 INSTALL_ROOT = ./install.dir
 
+# prefix for /bin directory
+BIN_PREFIX = /usr
+
 # ==============================================================================
 
 # directories used for local component builds
@@ -30,10 +33,10 @@ default:
 install: default
 	mkdir -p $(INSTALL_ROOT)
 
-	cd $(MOXERVER) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR)
+	cd $(MOXERVER) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) BIN_PREFIX=$(BIN_PREFIX)
 	cp -r $(MOXERVER)/$(INSTALLDIR)/* $(INSTALL_ROOT)/
 
-	cd $(MOXANIX) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR)
+	cd $(MOXANIX) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) BIN_PREFIX=$(BIN_PREFIX)
 	cp -r $(MOXANIX)/$(INSTALLDIR)/* $(INSTALL_ROOT)/
 
 # clean removes build and install results
diff --git a/moxanix/Makefile b/moxanix/Makefile
index e439d43..52cd9b6 100644
--- a/moxanix/Makefile
+++ b/moxanix/Makefile
@@ -8,6 +8,8 @@ TARGET_CONFIG = moxanix.cfg
 BUILDDIR = build.dir
 # installation root
 INSTALLDIR = install.dir
+# prefix for /bin directory
+BIN_PREFIX = /usr
 
 # ==============================================================================
 
@@ -20,8 +22,8 @@ default:
 # install targets
 install:
 	# install control script
-	mkdir -p $(INSTALLDIR)/bin
-	cp $(TARGET_CONTROL) $(INSTALLDIR)/bin/
+	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/
diff --git a/moxerver/Makefile b/moxerver/Makefile
index 5a5c22b..2c9a19f 100644
--- a/moxerver/Makefile
+++ b/moxerver/Makefile
@@ -7,6 +7,8 @@ TARGET_BINARY = moxerver
 BUILDDIR = build.dir
 # installation root
 INSTALLDIR = install.dir
+# prefix for /bin directory
+BIN_PREFIX = /usr
 
 # ==============================================================================
 
@@ -55,8 +57,8 @@ default: $(BUILDDIR)/$(TARGET_BINARY)
 
 # install target
 install: default
-	mkdir -p $(INSTALLDIR)/bin
-	cp $(BUILDDIR)/$(TARGET_BINARY) $(INSTALLDIR)/bin/
+	mkdir -p $(INSTALLDIR)/$(BIN_PREFIX)/bin
+	cp $(BUILDDIR)/$(TARGET_BINARY) $(INSTALLDIR)/$(BIN_PREFIX)/bin
 
 # clean removes object files and target (ignore errors with "-" before commands)
 clean: