Un-ignore SIGHUP by default.

[stg.git] / projects / sgconv / Makefile

diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile
index fae92f7b94902aac1457863e0c34a179366c209b..b463f1750cc876c2fcfc0c83db85f0d7cc80a8ee 100644 (file)
--- a/projects/sgconv/Makefile
+++ b/projects/sgconv/Makefile
@@ -18,14 +18,12 @@ STGLIBS = dotconfpp \
 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)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)

 
 ifeq ($(OS),linux)
 LIBS += -ldl
 
 ifeq ($(OS),linux)
 LIBS += -ldl

-D_FLAG = -D

 else
 else

-LIBS += -lc -liconv
-D_FLAG = -d
+LIBS += -lc

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


@@ -69,9 +67,11 @@ install: install-bin
 
 install-bin:
 ifeq ($(DEBUG), yes)
 
 install-bin:
 ifeq ($(DEBUG), yes)

-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/bin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)

 else
 else

-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/bin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)

 endif
        $(MAKE) -C $(DIR_PLUGINS) install
 
 endif
        $(MAKE) -C $(DIR_PLUGINS) install