rename /opt/axiom to /usr/axiom

makefiles/in_chroot/install.sh

@@ -44,25 +44,24 @@ function cdmake () {
     [[ -d "$1" ]] && make -C "$1" && make -C "$1" install
 }
 
-mkdir -p /opt/axiom/bin/
-echo 'PATH=$PATH:/opt/axiom/bin' >> /etc/profile
+mkdir -p /usr/axiom/bin/
+echo 'PATH=$PATH:/usr/axiom/bin' >> /etc/profile
 for dir in $(ls -d software/sensor_tools/*/); do cdmake "$dir"; done
 for dir in $(ls -d software/processing_tools/*/); do cdmake "$dir"; done
 
-mkdir -p /opt/axiom/script/
-echo 'PATH=$PATH:/opt/axiom/script' >> /etc/profile
-for script in software/scripts/*.sh; do ln -sf $(pwd)/$script /opt/axiom/script/axiom-$(basename $script | sed "s/_/-/g"); done
-for script in software/scripts/*.py; do ln -sf $(pwd)/$script /opt/axiom/script/axiom-$(basename $script | sed "s/_/-/g"); done
+mkdir -p /usr/axiom/script/
+echo 'PATH=$PATH:/usr/axiom/script' >> /etc/profile
+for script in software/scripts/*.sh; do ln -sf $(pwd)/$script /usr/axiom/script/axiom-$(basename $script | sed "s/_/-/g"); done
+for script in software/scripts/*.py; do ln -sf $(pwd)/$script /usr/axiom/script/axiom-$(basename $script | sed "s/_/-/g"); done
 
 
 # build and install the control daemon
 (cd software/axiom-control-daemon/
     [ -d build ] || mkdir -p build
     cd build
-    [ ../CMakeLists.txt -nt Makefile ] && cmake .. &&
-    make -j $(nproc) &&
+    cmake ..
+    make -j $(nproc)
     ./install_daemon.sh
-    true
 )
 
 # configure lighttpd

software/processing_tools/lut_conf/Makefile

@@ -15,7 +15,7 @@ lut_conf.static : lut_conf.o
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 
 clean:
 	rm -f *.o

software/processing_tools/mimg/Makefile

@@ -11,7 +11,7 @@ LDLIBS += -lm
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 	mkdir -p /opt/overlays
 	ln -sf $$(pwd)/overlays/ /opt/overlays/
 

software/sensor_tools/hist/Makefile

@@ -15,8 +15,7 @@ hist.static : hist.o
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /opt/axiom/bin/axiom-$$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 
 clean:
 	rm -f *.o

software/sensor_tools/perf/Makefile

@@ -17,7 +17,7 @@ perf : perf.o
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 
 clean:
 	rm -f *.o

software/sensor_tools/snap/Makefile

@@ -32,8 +32,7 @@ lut_conf.static : lut_conf.o
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /opt/axiom/bin/axiom-$$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 
 clean:
 	rm -f *.o

software/sensor_tools/train/Makefile

@@ -14,8 +14,7 @@ train.o : train.c cmv_reg.h
 
 install:
 	$(STRIP) $(TARGETS)
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/local/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
-	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /opt/axiom/bin/axiom-$$TARGET; done
+	for TARGET in $(TARGETS); do ln -sf $$(pwd)/$$TARGET /usr/axiom/bin/axiom-$$TARGET; chmod u+s $$TARGET; done
 
 clean:
 	rm -f *.o