Merge branch 'v3.12.4'

[libucw.git] / ucw / utils / Makefile

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 5bb5e643eb60af4b63a6e3524b159d489fa1a235..3227bb0a7401a302a33d63ed77c6f784aa14aab8 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,16 +1,19 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-PROGS+=$(addprefix $(o)/ucw/utils/,basecode daemon-helper rotate-log urltool)
+UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-helper rotate-log urltool)
+PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 
-ifdef CONFIG_DEBUG
-PROGS+=$(o)/ucw/utils/hex
-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)
 
 TESTS+=$(o)/ucw/utils/basecode.test
 $(o)/ucw/utils/basecode.test: $(o)/ucw/utils/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)
+
+.PHONY: install-ucw-utils