Merge branch 'master' into full-month-stats

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 03e95fa713885e15530fa00a313f356a25697923..2b6cbc1c4c6f2a778bd720dc93fa720a973876e5 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,11 +10,11 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
        ./listener.cpp \
        ./pidfile.cpp
 

-STGLIBS =  -lstg_logger \
-           -lstg_common \
-          -lstg_crypto \
-           -lscript_executer \
-           -lconffiles
+STGLIBS =  -lstglogger \
+           -lstgcommon \
+          -lstgcrypto \
+           -lstgscriptexecuter \
+           -lstgconffiles

 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 


@@ -56,13 +56,12 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 install: install-bin install-data
 
 install-bin:

-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc

-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer

        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data
        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data