X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Futils%2FMakefile;h=ba4f97833bdce1e13064e68479655cf65907d9b1;hb=34cb2b0143a1df0cde5edeb5e952db30e85ee987;hp=3227bb0a7401a302a33d63ed77c6f784aa14aab8;hpb=ad920945145a18895ef391511c92ef42e0e4c3d7;p=libucw.git

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 3227bb0a..ba4f9783 100644
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,19 +1,27 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-helper rotate-log urltool)
-PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 
-$(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/urltool: $(o)/ucw/utils/urltool.o $(LIBUCW)
+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
+
+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 $(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