Correcting data conversion in GetParamValue

[stg.git] / projects / sgconf / Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 0697b32996118dd8793ada7784f8cc409e704075..297d3e206983bb40c96ce9e9d5ab51e5b4051732 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -66,7 +66,11 @@ distclean: clean
 install: install-bin
 
 install-bin:
 install: install-bin
 
 install-bin:

-       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+ifeq ($(DEBUG), yes)
+       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+endif

        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin


@@ -87,6 +91,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 '%b\n' '\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