git.stg.codes
/
stg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37aa013
)
Fixed installation on BSD-systems.
author
Maxim Mamontov
<faust.madf@gmail.com>
Mon, 16 Mar 2015 20:06:04 +0000
(22:06 +0200)
committer
Maxim Mamontov
<faust.madf@gmail.com>
Mon, 16 Mar 2015 20:06:04 +0000
(22:06 +0200)
projects/rlm_stg/Makefile
patch
|
blob
|
history
projects/rscriptd/Makefile
patch
|
blob
|
history
projects/sgauth/Makefile
patch
|
blob
|
history
projects/sgauthstress/Makefile
patch
|
blob
|
history
projects/sgconf/Makefile
patch
|
blob
|
history
projects/sgconf_xml/Makefile
patch
|
blob
|
history
projects/sgconv/Makefile
patch
|
blob
|
history
projects/stargazer/Makefile
patch
|
blob
|
history
diff --git
a/projects/rlm_stg/Makefile
b/projects/rlm_stg/Makefile
index 3d4104838be58f4aa0a851281f2b08758a983648..15d973d800187251d0efadc83ce672255a08c787 100644
(file)
--- a/
projects/rlm_stg/Makefile
+++ b/
projects/rlm_stg/Makefile
@@
-13,8
+13,8
@@
SRCS = ./rlm_stg.c \
./stg_client.cpp
STGLIBS = crypto \
./stg_client.cpp
STGLIBS = crypto \
- common
-
+
common
+
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
@@
-22,10
+22,12
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
ifeq ($(OS),linux)
LIBS += -ldl
ifeq ($(OS),linux)
LIBS += -ldl
+D_FLAG = -D
else
LIBS += -lintl \
-lc \
else
LIBS += -lintl \
-lc \
- -liconv
+ -liconv
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-59,16
+61,16
@@
install: install-bin
install-bin:
ifeq ($(DEBUG), yes)
ifeq ($(OS), linux)
install-bin:
ifeq ($(DEBUG), yes)
ifeq ($(OS), linux)
- install
-D
-m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
else
else
- install
-D
-m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
endif
else
endif
else
- install
-D
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
ifeq ($(OS), linux)
ifeq ($(OS), linux)
- install
-D
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
else
else
- install
-D
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
endif
endif
$(MAKE) -C $(DIR_LIBSRC) install
endif
endif
$(MAKE) -C $(DIR_LIBSRC) install
diff --git
a/projects/rscriptd/Makefile
b/projects/rscriptd/Makefile
index 4c960db72b2fb61df756017224bee48d560fc3bb..cd357bbe794c85058420fcd493fc3ffef959d364 100644
(file)
--- a/
projects/rscriptd/Makefile
+++ b/
projects/rscriptd/Makefile
@@
-23,6
+23,9
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
ifneq ($(OS),linux)
LIBS += -liconv
ifneq ($(OS),linux)
LIBS += -liconv
+D_FLAG = -D
+else
+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
diff --git
a/projects/sgauth/Makefile
b/projects/sgauth/Makefile
index ef6491194847a7486ceb072b17c7e715bf702ff3..3c538966727c3782e49b4f5443301eaddcd52f67 100644
(file)
--- a/
projects/sgauth/Makefile
+++ b/
projects/sgauth/Makefile
@@
-23,7
+23,10
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
ifneq ($(OS),linux)
LIBS += -lintl \
-lc \
ifneq ($(OS),linux)
LIBS += -lintl \
-lc \
- -liconv
+ -liconv
+D_FLAG = -D
+else
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-59,9
+62,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
diff --git
a/projects/sgauthstress/Makefile
b/projects/sgauthstress/Makefile
index f88e59c614427db99bf529f9e2725ef5d5d56c88..3cc73a97a2e0c59d4f0fd4394a327c17eb567b61 100644
(file)
--- a/
projects/sgauthstress/Makefile
+++ b/
projects/sgauthstress/Makefile
@@
-9,8
+9,8
@@
SRCS = main.cpp \
proto.cpp
STGLIBS = dotconfpp \
proto.cpp
STGLIBS = dotconfpp \
- crypto \
- common
+
crypto \
+
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
@@
-19,10
+19,12
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
ifeq ($(OS),linux)
LIBS += -ldl
ifeq ($(OS),linux)
LIBS += -ldl
+D_FLAG = -D
else
LIBS += -lintl \
-lc \
else
LIBS += -lintl \
-lc \
- -liconv
+ -liconv
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
diff --git
a/projects/sgconf/Makefile
b/projects/sgconf/Makefile
index 096991221d761977ddd36c10897a4ff922d8ac55..be5134398459397cab65c8c61d6ea60f9c6351f6 100644
(file)
--- a/
projects/sgconf/Makefile
+++ b/
projects/sgconf/Makefile
@@
-11,7
+11,7
@@
SRCS = ./main.cpp \
STGLIBS = conffiles \
srvconf \
STGLIBS = conffiles \
srvconf \
- crypto \
+
crypto \
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
@@
-22,7
+22,10
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
ifeq ($(OS),linux)
else
LIBS += -lc \
ifeq ($(OS),linux)
else
LIBS += -lc \
- -liconv
+ -liconv
+D_FLAG = -D
+else
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-71,9
+74,9
@@
install: install-bin
install-bin:
ifeq ($(DEBUG), yes)
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
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_LIBSRC) install
endif
$(MAKE) -C $(DIR_LIBSRC) install
diff --git
a/projects/sgconf_xml/Makefile
b/projects/sgconf_xml/Makefile
index b953bb526cd9b059958e19cb37dfda8c6e78a5cd..ab53b752be4fd028848ed2bc6a924b172fc65ff0 100644
(file)
--- a/
projects/sgconf_xml/Makefile
+++ b/
projects/sgconf_xml/Makefile
@@
-22,7
+22,10
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
ifeq ($(OS),linux)
else
LIBS += -lc \
ifeq ($(OS),linux)
else
LIBS += -lc \
- -liconv
+ -liconv
+D_FLAG = -D
+else
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-67,9
+70,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/bin/$(PROG)
+ install
$(D_FLAG)
-m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
else
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_LIBSRC) install
endif
$(MAKE) -C $(DIR_LIBSRC) install
diff --git
a/projects/sgconv/Makefile
b/projects/sgconv/Makefile
index ceea22b76e6ecf0b7dbe75556dfdd94d96721f73..fae92f7b94902aac1457863e0c34a179366c209b 100644
(file)
--- a/
projects/sgconv/Makefile
+++ b/
projects/sgconv/Makefile
@@
-10,9
+10,9
@@
SRCS = ./main.cpp \
./settings_impl.cpp
STGLIBS = dotconfpp \
./settings_impl.cpp
STGLIBS = dotconfpp \
- conffiles \
- logger \
- crypto \
+
conffiles \
+
logger \
+
crypto \
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
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
ifeq ($(OS),linux)
LIBS += -ldl
+D_FLAG = -D
else
LIBS += -lc -liconv
else
LIBS += -lc -liconv
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-45,7
+47,7
@@
all: libs plugins $(PROG) ../../Makefile.conf
libs:
$(MAKE) -C $(DIR_LIBSRC)
libs:
$(MAKE) -C $(DIR_LIBSRC)
-plugins: libs
+plugins: libs
$(MAKE) -C $(DIR_PLUGINS)
$(PROG): $(OBJS)
$(MAKE) -C $(DIR_PLUGINS)
$(PROG): $(OBJS)
@@
-67,9
+69,9
@@
install: install-bin
install-bin:
ifeq ($(DEBUG), yes)
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
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
endif
$(MAKE) -C $(DIR_PLUGINS) install
diff --git
a/projects/stargazer/Makefile
b/projects/stargazer/Makefile
index e210dc2fc99932377f2142078497dc1ed31e0795..640fb0e10726113282ce147c98cd4cfed60c4edb 100644
(file)
--- a/
projects/stargazer/Makefile
+++ b/
projects/stargazer/Makefile
@@
-37,8
+37,10
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
ifeq ($(OS),linux)
LIBS += -ldl
ifeq ($(OS),linux)
LIBS += -ldl
+D_FLAG = -D
else
LIBS += -lc -liconv
else
LIBS += -lc -liconv
+D_FLAG = -d
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-83,9
+85,9
@@
install: install-bin install-data
install-bin: $(PROG)
ifeq ($(DEBUG), yes)
install-bin: $(PROG)
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_INCLUDE) install
$(MAKE) -C $(DIR_LIBSRC) install
endif
$(MAKE) -C $(DIR_INCLUDE) install
$(MAKE) -C $(DIR_LIBSRC) install