Merge branch 'master' into dev-opt

[libucw.git] / ucw / shell / Makefile

diff --git a/ucw/shell/Makefile b/ucw/shell/Makefile
index d45895acfd561cb183d5f03404a5afd28ad3baea..b3b4b509c6678e3ab0b5afecdfe769128664b8d7 100644 (file)
--- a/ucw/shell/Makefile
+++ b/ucw/shell/Makefile
@@ -1,20 +1,20 @@
 # Support routines for shell scripts
 
 DIRS+=ucw/shell
 # Support routines for shell scripts
 
 DIRS+=ucw/shell

-UCW_SHELL_PROGS=$(addprefix $(o)/ucw/shell/,config logger)
+UCW_SHELL_PROGS=$(addprefix $(o)/ucw/shell/ucw-,config logger logoutput)

 PROGS+=$(UCW_SHELL_PROGS)
 DATAFILES+=$(o)/ucw/shell/libucw.sh
 
 PROGS+=$(UCW_SHELL_PROGS)
 DATAFILES+=$(o)/ucw/shell/libucw.sh
 

-$(o)/ucw/shell/config: $(o)/ucw/shell/config.o $(LIBUCW)
-$(o)/ucw/shell/logger: $(o)/ucw/shell/logger.o $(LIBUCW)
+$(o)/ucw/shell/ucw-config: $(o)/ucw/shell/ucw-config.o $(LIBUCW)
+$(o)/ucw/shell/ucw-logger: $(o)/ucw/shell/ucw-logger.o $(LIBUCW)
+$(o)/ucw/shell/ucw-logoutput: $(o)/ucw/shell/ucw-logoutput.o $(LIBUCW)

 
 TESTS+=$(addprefix $(o)/ucw/shell/,config.test)
 
 
 TESTS+=$(addprefix $(o)/ucw/shell/,config.test)
 

-$(o)/ucw/shell/config.test: $(o)/ucw/shell/config
+$(o)/ucw/shell/config.test: $(o)/ucw/shell/ucw-config

 
 INSTALL_TARGETS+=install-ucw-shell
 install-ucw-shell:
 
 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
 .PHONY: install-ucw-shell