eq/neq fixes.

[stg.git] / projects / sgconv / Makefile

diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile
index 794114c779b3bf450ecf758721a6f80222c1a5f0..fae92f7b94902aac1457863e0c34a179366c209b 100644 (file)
--- a/projects/sgconv/Makefile
+++ b/projects/sgconv/Makefile
@@ -10,9 +10,9 @@ SRCS = ./main.cpp \
        ./settings_impl.cpp
 
 STGLIBS = dotconfpp \
-         conffiles \
-         logger \
-         crypto \
+          conffiles \
+          logger \
+          crypto \
           common
 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
@@ -22,8 +22,10 @@ LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
+D_FLAG = -D
 else
 LIBS += -lc -liconv
+D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -32,7 +34,12 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
 CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
-LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
+
+ifneq ($(OS),darwin)
+LDFLAGS += -Wl,-E
+endif
+
+LDFLAGS += $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf
@@ -40,7 +47,7 @@ all: libs plugins $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
-plugins: libs 
+plugins: libs
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS)
@@ -62,9 +69,9 @@ install: install-bin
 
 install-bin:
 ifeq ($(DEBUG), yes)
-       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
 else
-       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
 endif
        $(MAKE) -C $(DIR_PLUGINS) install