Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / sgconf / Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index fd012fc40f1033e325b90ea30f4a6abae3ec4ade..3a64cb6147e9358101bedeed0d8616975233054a 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -8,12 +8,14 @@ PROG = sgconf
 
 SRCS = ./main.cpp \
        ./options.cpp \
+       ./api_action.cpp \
        ./actions.cpp \
        ./admins.cpp \
        ./tariffs.cpp \
        ./users.cpp \
        ./services.cpp \
        ./corps.cpp \
+       ./info.cpp \
        ./xml.cpp
 
 STGLIBS = srvconf \
@@ -73,9 +75,11 @@ install: install-bin
 
 install-bin:
 ifeq ($(DEBUG), yes)
-       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 else
-       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 endif
        $(MAKE) -C $(DIR_LIBSRC) install