Fix DIRS param number in "OnDisconnect" scripts

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 2b7395a3d0e9d7615b48dda5c5b8c358f5fb9ed6..a4e2a5572687f259fe5561073f216ec058ff4514 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,17 +10,21 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
        ./listener.cpp \
        ./pidfile.cpp
 

-STGLIBS =  logger \
-          locker \
-           common \
-          crypto \
-           scriptexecuter \
-           conffiles
+STGLIBS = scriptexecuter \
+          conffiles \
+         logger \
+         locker \
+         crypto \
+          common

 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 

-LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+
+ifneq ($(OS),linux)
+LIBS += -liconv
+endif

 
 SEARCH_DIRS = -I ../../include
 
 
 SEARCH_DIRS = -I ../../include
 


@@ -86,5 +90,3 @@ deps: $(SRCS) ../../Makefile.conf
          echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
          echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done
          echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
          echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done

-
-