Packages: Install subset of UCW utilities to /usr/sbin instead of /usr/bin.

diff --git a/ucw/shell/Makefile b/ucw/shell/Makefile
index 62774c3cdeaf69a83e0b47d70aed03ffd7f0ca48..b3b4b509c6678e3ab0b5afecdfe769128664b8d7 100644 (file)
--- a/ucw/shell/Makefile
+++ b/ucw/shell/Makefile
@@ -15,6 +15,6 @@ $(o)/ucw/shell/config.test: $(o)/ucw/shell/ucw-config
 
 INSTALL_TARGETS+=install-ucw-shell
 install-ucw-shell:
-       install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
-       install -m 755 $(UCW_SHELL_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
+       install -d -m 755 $(DESTDIR)$(INSTALL_SBIN_DIR)
+       install -m 755 $(UCW_SHELL_PROGS) $(DESTDIR)$(INSTALL_SBIN_DIR)
 .PHONY: install-ucw-shell

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index dda7be75baf8c2036b655561bc56d64012fad6ee..ba4f97833bdce1e13064e68479655cf65907d9b1 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,13 +1,15 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-UCW_UTILS=$(addprefix $(o)/ucw/utils/ucw-,basecode daemon-control rotate-log urltool)
 DIRS+=ucw/utils
 
+UCW_SBIN_UTILS=$(addprefix $(o)/ucw/utils/ucw-,daemon-control rotate-log)
+UCW_BIN_UTILS=$(addprefix $(o)/ucw/utils/ucw-,basecode urltool)
+
 ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER
-UCW_UTILS+=$(o)/ucw/utils/ucw-daemon-helper
+UCW_SBIN_UTILS+=$(o)/ucw/utils/ucw-daemon-helper
 endif
 
-PROGS+=$(UCW_UTILS)
+PROGS+=$(UCW_BIN_UTILS) $(UCW_SBIN_UTILS)
 
 $(o)/ucw/utils/ucw-basecode: $(o)/ucw/utils/ucw-basecode.o $(LIBUCW)
 $(o)/ucw/utils/ucw-daemon-helper: $(o)/ucw/utils/ucw-daemon-helper.o $(LIBUCW)
@@ -19,6 +21,7 @@ $(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode
 
 INSTALL_TARGETS+=install-ucw-utils
 install-ucw-utils:
-       install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
-       install -m 755 $(UCW_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)
+       install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_BIN_DIR) $(INSTALL_SBIN_DIR))
+       install -m 755 $(UCW_SBIN_UTILS) $(DESTDIR)$(INSTALL_SBIN_DIR)
+       install -m 755 $(UCW_BIN_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)
 .PHONY: install-ucw-utils