eq/neq fixes.

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 4c960db72b2fb61df756017224bee48d560fc3bb..b6812aea20d517854e8d837ab175f30fec282820 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -21,8 +21,11 @@ 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 += -liconv
 LIBS += -liconv

+D_FLAG = -d

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


@@ -62,9 +65,9 @@ install: install-bin install-data
 
 install-bin:
 ifeq ($(DEBUG), yes)
 
 install-bin:
 ifeq ($(DEBUG), yes)

-       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)

 else
 else

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

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


@@ -73,11 +76,11 @@ install-data:
        mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
 ifeq ($(OS), linux)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
 ifeq ($(OS), linux)

-       install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
-       install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/

 else
 else

-       install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
-       install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/

 endif
 
 uninstall: uninstall-bin uninstall-data
 endif
 
 uninstall: uninstall-bin uninstall-data