X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5a98249bfadbe1d22d316dc3e9e770e0c305e5d6..37a3d7cb20e73c30a743de64b6e85d718177d5a1:/projects/sgconf/Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index e2fb8c1b..795c2522 100644
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -7,12 +7,7 @@ include ../../Makefile.conf
 PROG = sgconf
 
 SRCS = ./main.cpp \
-       ./options.cpp \
-       ./actions.cpp \
-       ./admins.cpp \
-       ./tariffs.cpp \
-       ./users.cpp \
-       ./xml.cpp
+       ./common_sg.cpp
 
 STGLIBS = conffiles \
           srvconf \
@@ -22,12 +17,11 @@ STGLIBS = conffiles \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 else
-LIBS += -lc \
-        -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -76,9 +70,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
 
@@ -96,7 +92,7 @@ endif
 endif
 endif
 
-deps: $(SRCS) ../../Makefile.conf
+deps:	$(SRCS) ../../Makefile.conf
 	$(MAKE) -C $(DIR_LIBSRC)
 	@>deps ;\
 	for file in $(SRCS); do\