eq/neq fixes.

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index cd357bbe794c85058420fcd493fc3ffef959d364..b6812aea20d517854e8d837ab175f30fec282820 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -21,10 +21,10 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 

-ifneq ($(OS),linux)
-LIBS += -liconv
+ifeq ($(OS),linux)

 D_FLAG = -D
 else
 D_FLAG = -D
 else

+LIBS += -liconv

 D_FLAG = -d
 endif
 
 D_FLAG = -d
 endif
 

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 3c538966727c3782e49b4f5443301eaddcd52f67..c1a3c9e9fad8abdee861c50f7ca69bcc96a65e3b 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -20,12 +20,12 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 

-ifneq ($(OS),linux)
+ifeq ($(OS),linux)
+D_FLAG = -D
+else

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

-D_FLAG = -D
-else

 D_FLAG = -d
 endif
 
 D_FLAG = -d
 endif