Fixes due to stupid behaviour of BSD-like install.

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index 15d973d800187251d0efadc83ce672255a08c787..efc1bcaa9f38ad657030b4c7aa74103c9d45395c 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -22,12 +22,10 @@ LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
-D_FLAG = -D
 else
 LIBS += -lintl \
         -lc \
         -liconv
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -61,16 +59,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

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index b6812aea20d517854e8d837ab175f30fec282820..516894b6459c407b5c5db0171dcac000a496a899 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -22,10 +22,8 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
-D_FLAG = -D
 else
 LIBS += -liconv
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -65,9 +63,11 @@ install: install-bin install-data
 
 install-bin:
 ifeq ($(DEBUG), yes)
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 endif
        $(MAKE) -C $(DIR_LIBSRC) install
 
@@ -76,11 +76,13 @@ 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)
-       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/
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
+       install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+       install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
 else
-       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/
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
+       install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+       install -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
 endif
 
 uninstall: uninstall-bin uninstall-data

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index c1a3c9e9fad8abdee861c50f7ca69bcc96a65e3b..c6c733f01b5bb24a6e960289ee16f044602b8fc2 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -21,12 +21,10 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
-D_FLAG = -D
 else
 LIBS += -lintl \
         -lc \
         -liconv
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -62,9 +60,11 @@ install: install-bin install-data
 
 install-bin:
 ifeq ($(DEBUG), yes)
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 endif
        $(MAKE) -C $(DIR_LIBSRC) install
 

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 3cc73a97a2e0c59d4f0fd4394a327c17eb567b61..4884b21367b5fb9da727ce2c3a93cedc84ab67ce 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -19,12 +19,10 @@ LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
-D_FLAG = -D
 else
 LIBS += -lintl \
         -lc \
         -liconv
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index be5134398459397cab65c8c61d6ea60f9c6351f6..280b40be0270e29f297338b0238099b830bc5773 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -23,9 +23,7 @@ ifeq ($(OS),linux)
 else
 LIBS += -lc \
         -liconv
-D_FLAG = -D
 else
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -74,9 +72,11 @@ install: install-bin
 
 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
-       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_LIBSRC) install
 

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index ab53b752be4fd028848ed2bc6a924b172fc65ff0..df79bbdb59835525f4512a9fb3844b3491c1d853 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -23,9 +23,7 @@ ifeq ($(OS),linux)
 else
 LIBS += -lc \
         -liconv
-D_FLAG = -D
 else
-D_FLAG = -d
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -70,9 +68,11 @@ install: install-bin install-data
 
 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
-       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_LIBSRC) install
 

diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile
index fae92f7b94902aac1457863e0c34a179366c209b..ff6308eddc5414f298b5e681a45cbba2ad8f2d02 100644 (file)
--- a/projects/sgconv/Makefile
+++ b/projects/sgconv/Makefile
@@ -22,10 +22,8 @@ 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
@@ -69,9 +67,11 @@ install: install-bin
 
 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
-       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
 

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 640fb0e10726113282ce147c98cd4cfed60c4edb..0fbccd32ec74fb29eb64bc5e1367a18a92595944 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -37,10 +37,8 @@ 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
@@ -85,9 +83,11 @@ install: install-bin install-data
 
 install-bin: $(PROG)
 ifeq ($(DEBUG), yes)
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 else
-       install $(D_FLAG) -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 endif
        $(MAKE) -C $(DIR_INCLUDE) install
        $(MAKE) -C $(DIR_LIBSRC) install