X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/85513928f6a270af94c1477f5ae2773647b04cd7..76addde818f6fdc09ff8ff264eafeab7d4c1af8e:/projects/sgconf/Makefile diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile index c5f3e4bf..795c2522 100644 --- a/projects/sgconf/Makefile +++ b/projects/sgconf/Makefile @@ -7,13 +7,7 @@ include ../../Makefile.conf PROG = sgconf SRCS = ./main.cpp \ - ./common_sg.cpp \ - ./options.cpp \ - ./actions.cpp \ - ./admins.cpp \ - ./tariffs.cpp \ - ./users.cpp \ - ./xml.cpp + ./common_sg.cpp STGLIBS = conffiles \ srvconf \ @@ -23,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 @@ -77,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 @@ -97,7 +92,7 @@ endif endif endif -deps: $(SRCS) ../../Makefile.conf +deps: $(SRCS) ../../Makefile.conf $(MAKE) -C $(DIR_LIBSRC) @>deps ;\ for file in $(SRCS); do\