Ticket 37. In the ProcessNewMonth() function switch construction changed

[stg.git] / projects / sgconf_xml / Makefile

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index b7ebca0addfb67ba8950e00ba94087d9383ea135..a7058b896cc497242c200a27375c000dee07bf6f 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -17,12 +17,11 @@ STGLIBS = conffiles \
 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 += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) $(LIBICONV)

 
 ifeq ($(OS),linux)
 else
 
 ifeq ($(OS),linux)
 else

-LIBS += -lc \
-       -liconv
+LIBS += -lc

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


@@ -66,7 +65,13 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 install: install-bin install-data
 
 install-bin:

+ifeq ($(DEBUG), yes)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+else
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)

+endif

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