Fix occasional crash on second and more reload in SMUX plugin

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 2666dc3791f2240a61d73a9b2ec2c43564dd8521..0912be081cc26b33cc1ad1afa8a95b7bf623dbd6 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -62,8 +62,8 @@ install-bin:
 
 install-data:
        # Install etc
 
 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
 
 
 uninstall: uninstall-bin uninstall-data
 


@@ -72,7 +72,7 @@ uninstall-bin:
 
 uninstall-data:
        # Uninstall etc
 
 uninstall-data:
        # Uninstall etc

-       rm -f $(PREFIX)/etc/stragazer/rscriptd.conf
+       rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf

 
 
 ifneq ($(MAKECMDGOALS),distclean)
 
 
 ifneq ($(MAKECMDGOALS),distclean)


@@ -87,6 +87,13 @@ deps:        $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
-         printf '\t$$(CC) -c $$< $(CXXFLAGS)\n' >> 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
        done