- fix: s/-/_/ in exported Makefile vars (some shells don't support '-' in

 variables)

Makefile

@@ -410,7 +410,7 @@ modules-doc:
 .PHONY: install
 install: install-bin install-modules install-cfg \
 	install-doc install-man install-utils
-		mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/serctl #fix
+		mv -f $(bin_prefix)/$(bin_dir)/sc $(bin_prefix)/$(bin_dir)/serctl #fix
 
 .PHONY: dbinstall
 dbinstall:
@@ -418,50 +418,53 @@ dbinstall:
 	scripts/mysql/ser_mysql.sh create
 	-@echo "Done"
 
-mk-install-dirs: $(cfg-prefix)/$(cfg-dir) $(bin-prefix)/$(bin-dir) \
-			$(modules-prefix)/$(modules-dir) $(doc-prefix)/$(doc-dir) \
-			$(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
+mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \
+			$(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \
+			$(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
 
 
-$(cfg-prefix)/$(cfg-dir): 
-		mkdir -p $(cfg-prefix)/$(cfg-dir)
+$(cfg_prefix)/$(cfg_dir): 
+		mkdir -p $(cfg_prefix)/$(cfg_dir)
 
-$(bin-prefix)/$(bin-dir):
-		mkdir -p $(bin-prefix)/$(bin-dir)
+$(bin_prefix)/$(bin_dir):
+		mkdir -p $(bin_prefix)/$(bin_dir)
 
-$(modules-prefix)/$(modules-dir):
-		mkdir -p $(modules-prefix)/$(modules-dir)
+$(modules_prefix)/$(modules_dir):
+		mkdir -p $(modules_prefix)/$(modules_dir)
 
 
-$(doc-prefix)/$(doc-dir):
-		mkdir -p $(doc-prefix)/$(doc-dir)
+$(doc_prefix)/$(doc_dir):
+		mkdir -p $(doc_prefix)/$(doc_dir)
 
-$(man-prefix)/$(man-dir)/man8:
-		mkdir -p $(man-prefix)/$(man-dir)/man8
+$(man_prefix)/$(man_dir)/man8:
+		mkdir -p $(man_prefix)/$(man_dir)/man8
 
-$(man-prefix)/$(man-dir)/man5:
-		mkdir -p $(man-prefix)/$(man-dir)/man5
+$(man_prefix)/$(man_dir)/man5:
+		mkdir -p $(man_prefix)/$(man_dir)/man5
 		
 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
-install-cfg: $(cfg-prefix)/$(cfg-dir)
-		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
+install-cfg: $(cfg_prefix)/$(cfg_dir)
+		sed -e "s#/usr/.*lib/ser/modules/#$(modules_target)#g" \
+			< etc/ser.cfg > $(cfg_prefix)/$(cfg_dir)ser.cfg.sample
+		chmod 644 $(cfg_prefix)/$(cfg_dir)ser.cfg.sample
 		if [ -z "${skip_cfg_install}" -a \
-				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
-			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
-				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
+				! -f $(cfg_prefix)/$(cfg_dir)ser.cfg ]; then \
+			mv -f $(cfg_prefix)/$(cfg_dir)ser.cfg.sample \
+				$(cfg_prefix)/$(cfg_dir)ser.cfg; \
 		fi
 		# radius dictionary
-		$(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.ser 
-		$(INSTALL-CFG) etc/dictionary.ser $(cfg-prefix)/$(cfg-dir)
-#		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
+		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.ser 
+		$(INSTALL_CFG) etc/dictionary.ser $(cfg_prefix)/$(cfg_dir)
+#		$(INSTALL_CFG) etc/ser.cfg $(cfg_prefix)/$(cfg_dir)
 
-install-bin: $(bin-prefix)/$(bin-dir) $(NAME)
-		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)
-		$(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir)
+install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
+		$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
+		$(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
 
-install-modules: $(modules-prefix)/$(modules-dir)
+
+export INSTALL_TOUCH RELEASE
+
+install-modules: $(modules_prefix)/$(modules_dir)
 	@for r in $(modules) "" ; do \
 		if [ -n "$$r" -a -r "$$r/Makefile" ]; then \
 			echo  "" ; \
@@ -474,13 +477,13 @@ install-modules: $(modules-prefix)/$(modules-dir)
 		fi ; \
 	done; true
 
-install-utils: utils $(bin-prefix)/$(bin-dir)
+install-utils: utils $(bin_prefix)/$(bin_dir)
 	@for r in $(utils_install) "" ; do \
 		if [ -n "$$r" ]; then \
 			if [ -f "$$r" ]; then \
-				$(INSTALL-TOUCH) \
-					$(bin-prefix)/$(bin-dir)/`basename "$$r"` ; \
-				$(INSTALL-BIN)  "$$r"  $(bin-prefix)/$(bin-dir) ; \
+				$(INSTALL_TOUCH) \
+					$(bin_prefix)/$(bin_dir)/`basename "$$r"` ; \
+				$(INSTALL_BIN)  "$$r"  $(bin_prefix)/$(bin_dir) ; \
 			else \
 				echo "ERROR: $$r not compiled" ; \
 				if [ ${err_fail} = 1 ] ; then \
@@ -495,46 +498,46 @@ install-utils: utils $(bin-prefix)/$(bin-dir)
 install-modules-all: install-modules install-modules-doc
 
 
-install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/INSTALL 
-	$(INSTALL-DOC) INSTALL $(doc-prefix)/$(doc-dir)
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README-MODULES 
-	$(INSTALL-DOC) README-MODULES $(doc-prefix)/$(doc-dir)
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/AUTHORS 
-	$(INSTALL-DOC) AUTHORS $(doc-prefix)/$(doc-dir)
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/NEWS
-	$(INSTALL-DOC) NEWS $(doc-prefix)/$(doc-dir)
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
-	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
+install-doc: $(doc_prefix)/$(doc_dir) install-modules-doc
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/INSTALL 
+	$(INSTALL_DOC) INSTALL $(doc_prefix)/$(doc_dir)
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/README_MODULES 
+	$(INSTALL_DOC) README_MODULES $(doc_prefix)/$(doc_dir)
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/AUTHORS 
+	$(INSTALL_DOC) AUTHORS $(doc_prefix)/$(doc_dir)
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/NEWS
+	$(INSTALL_DOC) NEWS $(doc_prefix)/$(doc_dir)
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/README 
+	$(INSTALL_DOC) README $(doc_prefix)/$(doc_dir)
 
 
-install-modules-doc: $(doc-prefix)/$(doc-dir)
+install-modules-doc: $(doc_prefix)/$(doc_dir)
 	@for r in $(modules_basenames) "" ; do \
 		if [ -n "$$r" ]; then \
 			if [ -f modules/"$$r"/README ]; then \
-				$(INSTALL-TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
-				$(INSTALL-DOC)  modules/"$$r"/README  \
-									$(doc-prefix)/$(doc-dir)/README ; \
-				mv -f $(doc-prefix)/$(doc-dir)/README \
-						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
+				$(INSTALL_TOUCH)  $(doc_prefix)/$(doc_dir)/README ; \
+				$(INSTALL_DOC)  modules/"$$r"/README  \
+									$(doc_prefix)/$(doc_dir)/README ; \
+				mv -f $(doc_prefix)/$(doc_dir)/README \
+						$(doc_prefix)/$(doc_dir)/README."$$r" ; \
 			fi ; \
 		fi ; \
 	done 
 
 
-install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
-		sed -e "s#/etc/ser/ser\.cfg#$(cfg-target)ser.cfg#g" \
-			-e "s#/usr/sbin/#$(bin-target)#g" \
-			-e "s#/usr/lib/ser/modules/#$(modules-target)#g" \
-			-e "s#/usr/share/doc/ser/#$(doc-target)#g" \
-			< ser.8 >  $(man-prefix)/$(man-dir)/man8/ser.8
-		chmod 644  $(man-prefix)/$(man-dir)/man8/ser.8
-		sed -e "s#/etc/ser/ser\.cfg#$(cfg-target)ser.cfg#g" \
-			-e "s#/usr/sbin/#$(bin-target)#g" \
-			-e "s#/usr/lib/ser/modules/#$(modules-target)#g" \
-			-e "s#/usr/share/doc/ser/#$(doc-target)#g" \
-			< ser.cfg.5 >  $(man-prefix)/$(man-dir)/man5/ser.cfg.5
-		chmod 644  $(man-prefix)/$(man-dir)/man5/ser.cfg.5
+install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
+		sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \
+			-e "s#/usr/sbin/#$(bin_target)#g" \
+			-e "s#/usr/lib/ser/modules/#$(modules_target)#g" \
+			-e "s#/usr/share/doc/ser/#$(doc_target)#g" \
+			< ser.8 >  $(man_prefix)/$(man_dir)/man8/ser.8
+		chmod 644  $(man_prefix)/$(man_dir)/man8/ser.8
+		sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \
+			-e "s#/usr/sbin/#$(bin_target)#g" \
+			-e "s#/usr/lib/ser/modules/#$(modules_target)#g" \
+			-e "s#/usr/share/doc/ser/#$(doc_target)#g" \
+			< ser.cfg.5 >  $(man_prefix)/$(man_dir)/man5/ser.cfg.5
+		chmod 644  $(man_prefix)/$(man_dir)/man5/ser.cfg.5
 
 
 ##################

Makefile.defs

@@ -12,7 +12,7 @@
 # History:
 # --------
 #              created by andrei
-#  2003-02-24  added LOCALBASE, fixed doc-dir for freebsd - patch provided
+#  2003-02-24  added LOCALBASE, fixed doc_dir for freebsd - patch provided
 #               by Maxim Sobolev <[email protected]>
 #  2003-02-25  added -DDISABLE_NAGLE (andrei)
 #  2003-03-02  added -DDIGEST_DOMAIN (janakj)
@@ -54,7 +54,7 @@
 #  2007-02-09  added TLS_HOOKS and CORE_TLS support, obsoleted TLS=1
 #              added TLS_EXTRA_LIBS (andrei)
 #  2007-03-16  added LIB building options: LIB_LDFLAGS, LIB_SONAME, LIB_RPATH,
-#                INSTALL-LIB, libraries install paths (andrei)
+#                INSTALL_LIB, libraries install paths (andrei)
 
 
 # check if already included/exported
@@ -122,37 +122,37 @@ endif
 CC_EXTRA_OPTS ?=
 
 # dirs 
-cfg-dir = etc/ser/
-bin-dir = sbin/
-modules-dir = lib/ser/modules/
-lib-dir = lib/ser/
+cfg_dir = etc/ser/
+bin_dir = sbin/
+modules_dir = lib/ser/modules/
+lib_dir = lib/ser/
 ifeq ($(OS), linux)
-	doc-dir = share/doc/ser/
-	man-dir = share/man/
+	doc_dir = share/doc/ser/
+	man_dir = share/man/
 	LOCALBASE ?= /usr/local
 else
 ifeq ($(OS), freebsd)
-	doc-dir = share/doc/ser/
-	man-dir = man/
+	doc_dir = share/doc/ser/
+	man_dir = man/
 	LOCALBASE ?= /usr/local
 else
 ifeq ($(OS), openbsd)
-	doc-dir = share/doc/ser/
-	man-dir = man/
+	doc_dir = share/doc/ser/
+	man_dir = man/
 	LOCALBASE ?= /usr/local
 else
 ifeq ($(OS), netbsd)
-	doc-dir = share/doc/ser
-	man-dir = man/
+	doc_dir = share/doc/ser
+	man_dir = man/
 	LOCALBASE ?= /usr/pkg
 else
 ifeq ($(OS), darwin)
-	doc-dir = share/doc/ser/
-	man-dir = man/
+	doc_dir = share/doc/ser/
+	man_dir = man/
 	LOCALBASE ?= /usr/local
 else
-	doc-dir = doc/ser/
-	man-dir = man/
+	doc_dir = doc/ser/
+	man_dir = man/
 	LOCALBASE ?= /usr/local
 endif
 endif
@@ -173,21 +173,21 @@ prefix = $(PREFIX)
 BASEDIR ?=
 basedir = $(BASEDIR)
 # install prefixes for various stuff
-cfg-prefix = $(basedir)$(prefix)
-bin-prefix = $(basedir)$(prefix)
-modules-prefix = $(basedir)$(prefix)
-lib-prefix = $(basedir)$(prefix)
-doc-prefix = $(basedir)$(prefix)
-man-prefix = $(basedir)$(prefix)
-ut-prefix = $(basedir)$(prefix)
+cfg_prefix = $(basedir)$(prefix)
+bin_prefix = $(basedir)$(prefix)
+modules_prefix = $(basedir)$(prefix)
+lib_prefix = $(basedir)$(prefix)
+doc_prefix = $(basedir)$(prefix)
+man_prefix = $(basedir)$(prefix)
+ut_prefix = $(basedir)$(prefix)
 
 
 # target dirs for various stuff
-cfg-target = $(prefix)/$(cfg-dir)
-bin-target = $(prefix)/$(bin-dir)
-modules-target = $(prefix)/$(modules-dir)
-lib-target = $(prefix)/$(lib-dir)
-doc-target = $(prefix)/$(doc-dir)
+cfg_target = $(prefix)/$(cfg_dir)
+bin_target = $(prefix)/$(bin_dir)
+modules_target = $(prefix)/$(modules_dir)
+lib_target = $(prefix)/$(lib_dir)
+doc_target = $(prefix)/$(doc_dir)
 
 
 ifeq ($(OS), solaris)
@@ -199,14 +199,14 @@ INSTALL ?= install
 TAR ?= tar
 endif
 
-INSTALL-TOUCH = touch          # used to create the file first (good to 
+INSTALL_TOUCH = touch          # used to create the file first (good to 
                                #  make solaris install work)
-INSTALL-CFG = $(INSTALL) -m 644
-INSTALL-BIN = $(INSTALL) -m 755
-INSTALL-MODULES = $(INSTALL) -m 755
-INSTALL-LIB = $(INSTALL) -m 755
-INSTALL-DOC = $(INSTALL) -m 644
-INSTALL-MAN = $(INSTALL) -m 644
+INSTALL_CFG = $(INSTALL) -m 644
+INSTALL_BIN = $(INSTALL) -m 755
+INSTALL_MODULES = $(INSTALL) -m 755
+INSTALL_LIB = $(INSTALL) -m 755
+INSTALL_DOC = $(INSTALL) -m 644
+INSTALL_MAN = $(INSTALL) -m 644
 
 #set some vars from the environment (and not make builtins)
 CC   := $(shell echo "$${CC}")
@@ -392,7 +392,7 @@ DEFS+= $(extra_defs) \
 	 -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
 	 -DSER_VER=$(SER_VER) \
-	 -DCFG_DIR='"$(cfg-target)"'\
+	 -DCFG_DIR='"$(cfg_target)"'\
 	 -DPKG_MALLOC \
 	 -DSHM_MEM  -DSHM_MMAP \
 	 -DDNS_IP_HACK \
@@ -1506,10 +1506,10 @@ export LIBS
 export LEX YACC YACC_FLAGS
 export PREFIX LOCALBASE
 export TAR
-export cfg-prefix cfg-dir bin-prefix bin-dir modules-prefix modules-dir
-export doc-prefix doc-dir man-prefix man-dir ut-prefix ut-dir
-export lib-prefix lib-dir cfg-target lib-target modules-target
-export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
-export INSTALL-LIB INSTALL-TOUCH
+export cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir
+export doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir
+export lib_prefix lib_dir cfg_target lib_target modules_target
+export INSTALL INSTALL_CFG INSTALL_BIN INSTALL_MODULES INSTALL_DOC INSTALL_MAN 
+export INSTALL_LIB INSTALL_TOUCH
 
 endif  # ifeq ($(makefile_defs, 1)

Makefile.libs

@@ -86,23 +86,23 @@ link_clean:
 
 clean: link_clean
 
-$(lib-prefix)/$(lib-dir):
-	mkdir -p $(lib-prefix)/$(lib-dir)
+$(lib_prefix)/$(lib_dir):
+	mkdir -p $(lib_prefix)/$(lib_dir)
 
 .PHONY: install
-install: $(LIB_NAME) $(lib-prefix)/$(lib-dir)
-	$(INSTALL-TOUCH) $(lib-prefix)/$(lib-dir)/$(LIB_NAME)
-	$(INSTALL-LIB) $(LIB_NAME) $(lib-prefix)/$(lib-dir)
-	rm -f $(lib-prefix)/$(lib-dir)/$(LIB_RUNTIME_NAME) \
-			$(lib-prefix)/$(lib-dir)/$(LIB_LINK_NAME) 
-	ln -s $(lib-prefix)/$(lib-dir)/$(LIB_NAME) \
-			$(lib-prefix)/$(lib-dir)/$(LIB_RUNTIME_NAME) 
-	ln -s $(lib-prefix)/$(lib-dir)/$(LIB_NAME) \
-			$(lib-prefix)/$(lib-dir)/$(LIB_LINK_NAME) 
+install: $(LIB_NAME) $(lib_prefix)/$(lib_dir)
+	$(INSTALL_TOUCH) $(lib_prefix)/$(lib_dir)/$(LIB_NAME)
+	$(INSTALL_LIB) $(LIB_NAME) $(lib_prefix)/$(lib_dir)
+	rm -f $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) \
+			$(lib_prefix)/$(lib_dir)/$(LIB_LINK_NAME) 
+	ln -s $(lib_prefix)/$(lib_dir)/$(LIB_NAME) \
+			$(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) 
+	ln -s $(lib_prefix)/$(lib_dir)/$(LIB_NAME) \
+			$(lib_prefix)/$(lib_dir)/$(LIB_LINK_NAME) 
 
 
 .PHONY:install-if-newer
-install-if-newer: $(lib-prefix)/$(lib-dir)/$(LIB_RUNTIME_NAME) 
+install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) 
 
-$(lib-prefix)/$(lib-dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME)
+$(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME)
 	@$(MAKE) install

Makefile.modules

@@ -53,14 +53,15 @@ endif
 include $(COREPATH)/Makefile.rules
 
 
-$(modules-prefix)/$(modules-dir):
-		mkdir -p $(modules-prefix)/$(modules-dir)
+$(modules_prefix)/$(modules_dir):
+		mkdir -p $(modules_prefix)/$(modules_dir)
+
 
 
 .PHONY: install
-install: $(NAME) $(modules-prefix)/$(modules-dir)
-	$(INSTALL-TOUCH) $(modules-prefix)/$(modules-dir)/$(NAME)
-	$(INSTALL-MODULES)  $(NAME)  $(modules-prefix)/$(modules-dir)
+install: $(NAME) $(modules_prefix)/$(modules_dir)
+	$(INSTALL_TOUCH) $(modules_prefix)/$(modules_dir)/$(NAME)
+	$(INSTALL_MODULES)  $(NAME)  $(modules_prefix)/$(modules_dir)
 	@for lib in $(dir $(SER_LIBS)); do \
 		$(MAKE) -C "$${lib}" install-if-newer ;\
 	done

Makefile.rules

@@ -37,7 +37,7 @@
 ifneq	($(SER_LIBS),)
 ifneq	($(LD_RPATH),)
 ifneq	(,$(filter install, $(MAKECMDGOALS)))
-SER_RPATH_LST:=$(lib-target)
+SER_RPATH_LST:=$(lib_target)
 else
 SER_RPATH_LST:=$(realpath $(dir $(SER_LIBS)))
 endif