X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1adb53e896797c73b5528ee178bd73ff51be2c43..d8845c7819caac09b95c4cdf1e8d48cc1cb1b7a6:/projects/rscriptd/Makefile?ds=sidebyside diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index da06b50b..98b2f5e4 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -13,18 +13,13 @@ SRCS = ./main.cpp \ STGLIBS = scriptexecuter \ conffiles \ logger \ - locker \ crypto \ common STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS))) -LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) - -ifneq ($(OS),linux) -LIBS += -liconv -endif +LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV) SEARCH_DIRS = -I ../../include @@ -32,7 +27,12 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) -LDFLAGS += -Wl,-E $(STGLIBS_LIBS) + +ifneq ($(OS),darwin) +LDFLAGS += -Wl,-E +endif + +LDFLAGS += $(STGLIBS_LIBS) .PHONY: all clean distclean libs install uninstall all: libs $(PROG) ../../Makefile.conf @@ -58,9 +58,11 @@ install: install-bin install-data install-bin: ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(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/sbin/$(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 @@ -68,6 +70,15 @@ install-data: # Install etc mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf +ifeq ($(OS), linux) + mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd + install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ + install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ +else + mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd + install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ + install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ +endif uninstall: uninstall-bin uninstall-data @@ -77,7 +88,8 @@ uninstall-bin: uninstall-data: # Uninstall etc rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf - + rm -f $(PREFIX)/etc/rscriptd/OnConnect + rm -f $(PREFIX)/etc/rscriptd/OnDisconnect ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),clean)