X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Futils%2FMakefile;h=ba4f97833bdce1e13064e68479655cf65907d9b1;hb=0deec3a7b88a7b2ffa16c279bb29916f149095d7;hp=5bb5e643eb60af4b63a6e3524b159d489fa1a235;hpb=5ae436304a6686d3b6bcaa64e4f028490b7108ce;p=libucw.git

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 5bb5e643..ba4f9783 100644
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,16 +1,27 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-PROGS+=$(addprefix $(o)/ucw/utils/,basecode daemon-helper rotate-log urltool)
 DIRS+=ucw/utils
 
-ifdef CONFIG_DEBUG
-PROGS+=$(o)/ucw/utils/hex
+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_SBIN_UTILS+=$(o)/ucw/utils/ucw-daemon-helper
 endif
 
-$(o)/ucw/utils/basecode: $(o)/ucw/utils/basecode.o $(LIBUCW)
-$(o)/ucw/utils/daemon-helper: $(o)/ucw/utils/daemon-helper.o $(LIBUCW)
-$(o)/ucw/utils/hex: $(o)/ucw/utils/hex.o $(LIBUCW)
-$(o)/ucw/utils/urltool: $(o)/ucw/utils/urltool.o $(LIBUCW)
+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)
+$(o)/ucw/utils/ucw-daemon-control: $(o)/ucw/utils/ucw-daemon-control.o $(LIBUCW)
+$(o)/ucw/utils/ucw-urltool: $(o)/ucw/utils/ucw-urltool.o $(LIBUCW)
 
 TESTS+=$(o)/ucw/utils/basecode.test
-$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/basecode
+$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode
+
+INSTALL_TARGETS+=install-ucw-utils
+install-ucw-utils:
+	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