--- Makefile.orig Wed Jan 30 14:50:03 2008 +++ Makefile Wed Jan 30 16:41:05 2008 @@ -47,10 +47,10 @@ skip_modules?= # if not set on the cmd. line or the env, exclude this modules: -exclude_modules?= jabber cpl-c mysql pa postgres osp unixodbc \ - avp_radius auth_radius group_radius uri_radius xmpp \ - presence pua pua_mi pua_usrloc seas\ - mi_xmlrpc perl snmpstats +exclude_modules?= $(MYSQL) $(POSTGRESQL) $(SNMPSTATS) $(TLSOPS) $(UNIXODBC) \ + $(AUTHRADIUS) avp_radius group_radius uri_radius xmpp \ + presence pua pua_mi pua_usrloc seas mi_xmlrpc perl \ + snmpstats jabber osp auth_diameter ifeq ($(TLS),) exclude_modules+= tlsops endif @@ -343,21 +343,9 @@ # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work install-cfg: $(cfg-prefix)/$(cfg-dir) - sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \ - < etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 - sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-target)tls/#g" \ - < $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 \ - > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample - rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 - chmod 644 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample - if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg ]; then \ - mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \ - $(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \ - fi # radius dictionary $(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.radius - $(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir) + $(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)/dictionary.radius.default # openserctl config $(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample $(INSTALL_CFG) scripts/openserctlrc \ @@ -391,7 +379,7 @@ sed -e "s#/usr/local/lib/openser#$(lib-target)#g" | \ sed -e "s#/usr/local/etc/openser#$(cfg-target)#g" >/tmp/openserctl $(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/openserctl - $(INSTALL_BIN) /tmp/openserctl $(bin-prefix)/$(bin-dir) + $(BSD_INSTALL_SCRIPT) /tmp/openserctl $(bin-prefix)/$(bin-dir) rm -fr /tmp/openserctl sed -e "s#/usr/local/sbin#$(bin-target)#g" \ < scripts/openserctl.base > /tmp/openserctl.base @@ -456,7 +444,7 @@ sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \ < scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh ; \ $(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh ; \ - $(INSTALL_BIN) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir) ; \ + $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir) ; \ rm -fr /tmp/$(NAME)_mysql.sh ; \ fi if [ "$(PGSQLON)" = "yes" ]; then \ @@ -469,7 +457,7 @@ sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \ < scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh ; \ $(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh ; \ - $(INSTALL_BIN) /tmp/$(NAME)_postgresql.sh \ + $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh \ $(bin-prefix)/$(bin-dir) ; \ rm -fr /tmp/$(NAME)_postgresql.sh ; \ fi @@ -494,8 +482,6 @@ 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" ; \ fi ; \ fi ; \