Modiifed Gentoo init.d-script according to latest rules.

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 53029eb6f501a0b611a192b13bef3120e2a01292..0912be081cc26b33cc1ad1afa8a95b7bf623dbd6 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,21 +10,21 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.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)))
 
 
 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
 


@@ -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,8 +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 ;\
-         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
        done

-
-