$FreeBSD$ --- Makefile.orig +++ Makefile @@ -46,13 +46,12 @@ skip_modules?= # if not set on the cmd. line or the env, exclude this modules: -exclude_modules?= cpl ext extcmd \ - postgres snmp \ +exclude_modules?= cpl extcmd \ + $(POSTGRESQL) snmp \ im \ - jabber mysql \ + jabber $(MYSQL) \ cpl-c \ - auth_radius group_radius uri_radius avp_radius \ - pa + $(RADIUS) $(PA) # always exclude the CVS dir override exclude_modules+= CVS $(skip_modules) @@ -268,7 +267,7 @@ 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 \ + cp $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \ $(cfg-prefix)/$(cfg-dir)ser.cfg; \ fi # radius dictionary @@ -280,10 +279,10 @@ $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/ser $(INSTALL-BIN) ser $(bin-prefix)/$(bin-dir) $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/sc - $(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir) + $(INSTALL-SCRIPT) scripts/sc $(bin-prefix)/$(bin-dir) mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/serctl $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/ser_mysql.sh - $(INSTALL-BIN) scripts/ser_mysql.sh $(bin-prefix)/$(bin-dir) + $(INSTALL-SCRIPT) scripts/ser_mysql.sh $(bin-prefix)/$(bin-dir) $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/gen_ha1 $(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir) $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/serunix