X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7ff01d4395b25b73c3c329432ae47aa64b3e3ecf..6c9a0f6104d79654dd12f5d5e585af3c60649a48:/projects/rscriptd/Makefile?ds=sidebyside

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 53029eb6..0912be08 100644
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,21 +10,21 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
-STGLIBS =  logger \
-	   locker \
-           common \
-	   crypto \
-           scriptexecuter \
-           conffiles
-
-ifneq ($(OS),linux)
-LIBS += -liconv
-endif
+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 += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+
+ifneq ($(OS),linux)
+LIBS += -liconv
+endif
 
 SEARCH_DIRS = -I ../../include
 
@@ -62,8 +62,8 @@ install-bin:
 
 install-data:
 	# Install etc
-	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
-	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
+	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
+	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data
 
@@ -72,7 +72,7 @@ uninstall-bin:
 
 uninstall-data:
 	# Uninstall etc
-	rm -f $(PREFIX)/etc/stragazer/rscriptd.conf
+	rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf
 
 
 ifneq ($(MAKECMDGOALS),distclean)
@@ -87,8 +87,13 @@ deps:	$(SRCS) ../../Makefile.conf
 	$(MAKE) -C $(DIR_LIBSRC)
 	@>deps ;\
 	for file in $(SRCS); do\
-	  echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
-	  echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
+	  echo "$$file" | grep ".c$$" > /dev/null;\
+	  if [ $$? -eq 0 ];\
+	  then\
+	    echo "`$(CC) $(CFLAGS) -MM $$file` Makefile" >> deps ;\
+	    printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
+	  else\
+	    echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+	    printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
+	  fi;\
 	done
-
-