Logger: Fixed use of unitialized flags

[libucw.git] / ucw / utils / Makefile

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 2a8f2b9928973bd0f0c1df028229ebeaec92e956..ba4f97833bdce1e13064e68479655cf65907d9b1 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,13 +1,16 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
 # 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)
-PROGS+=$(UCW_UTILS)

 DIRS+=ucw/utils
 
 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
 ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER

-PROGS+=$(o)/ucw/utils/ucw-daemon-helper
+UCW_SBIN_UTILS+=$(o)/ucw/utils/ucw-daemon-helper

 endif
 
 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-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)


@@ -16,8 +19,9 @@ $(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/ucw-basecode
 
 TESTS+=$(o)/ucw/utils/basecode.test
 $(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode
 

-INSTALL_UTILS_TARGETS+=install-ucw-utils
+INSTALL_TARGETS+=install-ucw-utils

 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
 .PHONY: install-ucw-utils