Ticket 37. The checking schemaVersion = 0, 1, 2 removed,

[stg.git] / projects / rlm_stg / Makefile

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index 15d973d800187251d0efadc83ce672255a08c787..05c43d95135b559866886ac904108ce3fc074cfc 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -18,16 +18,13 @@ STGLIBS = crypto \
 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
-D_FLAG = -D
 else
 LIBS += -lintl \
-        -lc \
-        -liconv
-D_FLAG = -d
+        -lc
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -61,16 +58,21 @@ install: install-bin
 install-bin:
 ifeq ($(DEBUG), yes)
 ifeq ($(OS), linux)
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/freeradius
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
 endif
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/freeradius
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
 ifeq ($(OS), linux)
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/freeradius
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
 endif
 endif
        $(MAKE) -C $(DIR_LIBSRC) install