--- Makefile.orig	Tue Jul 11 11:43:40 2006
+++ Makefile	Wed Jul 12 17:26:29 2006
@@ -46,7 +46,7 @@
 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 \
+exclude_modules?= 		jabber $(POSTGRESQL) $(MYSQL) $(UNIXODBC) osp pa \
 						avp_radius auth_radius group_radius uri_radius
 ifeq ($(TLS),)
 	exclude_modules+= tlsops
@@ -335,21 +335,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-prefix)/$(cfg-dir)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 \
@@ -368,25 +356,7 @@
 			mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \
 			mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/user ; \
 			$(INSTALL-TOUCH) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
-			$(INSTALL-CFG) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
-			$(INSTALL-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-CFG) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-TOUCH) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-CFG) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-TOUCH) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-CFG) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
-			$(INSTALL-TOUCH) etc/tls/rootCA/certs/01.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/certs/; \
-			$(INSTALL-CFG) etc/tls/rootCA/certs/01.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/certs/; \
-			$(INSTALL-TOUCH) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
-			$(INSTALL-CFG) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
-			$(INSTALL-TOUCH) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-CFG) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-TOUCH) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-CFG) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-TOUCH) etc/tls/user/user-cert_req.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-			$(INSTALL-CFG) etc/tls/user/user-cert_req.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
+			$(BSD_INSTALL_DATA) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
 		fi
 
 install-bin: $(bin-prefix)/$(bin-dir) utils
@@ -394,37 +364,35 @@
 		$(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir)
 		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
 			< scripts/openserctl > /tmp/openserctl
-		sed -i -e "s#/usr/local/lib/openser#$(lib-target)#g" /tmp/openserctl
-		sed -i -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
 		mkdir -p $(modules-prefix)/$(lib-dir)/openserctl 
 		$(INSTALL-TOUCH) \
 			$(modules-prefix)/$(lib-dir)/openserctl
-		$(INSTALL-CFG) /tmp/openserctl.base \
+		$(BSD_INSTALL_DATA) /tmp/openserctl.base \
 			$(modules-prefix)/$(lib-dir)/openserctl/openserctl.base
 		rm -fr /tmp/openserctl.base
 		sed -e "s#/usr/local#$(bin-target)#g" \
 			< scripts/openserctl.ctlbase > /tmp/openserctl.ctlbase
-		$(INSTALL-CFG) /tmp/openserctl.ctlbase \
+		$(BSD_INSTALL_DATA) /tmp/openserctl.ctlbase \
 			$(modules-prefix)/$(lib-dir)/openserctl/openserctl.ctlbase
 		rm -fr /tmp/openserctl.ctlbase
 		sed -e "s#/usr/local#$(bin-target)#g" \
 			< scripts/openserctl.fifo > /tmp/openserctl.fifo
-		$(INSTALL-CFG) /tmp/openserctl.fifo \
+		$(BSD_INSTALL_DATA) /tmp/openserctl.fifo \
 			$(modules-prefix)/$(lib-dir)/openserctl/openserctl.fifo
 		rm -fr /tmp/openserctl.fifo
 		sed -e "s#/usr/local#$(bin-target)#g" \
 			< scripts/openserctl.unixsock > /tmp/openserctl.unixsock
-		$(INSTALL-CFG) /tmp/openserctl.unixsock \
+		$(BSD_INSTALL_DATA) /tmp/openserctl.unixsock \
 			$(modules-prefix)/$(lib-dir)/openserctl/openserctl.unixsock
 		rm -fr /tmp/openserctl.unixsock
 		sed -e "s#/usr/local#$(bin-target)#g" \
 			< scripts/openserctl.sqlbase > /tmp/openserctl.sqlbase
-		$(INSTALL-CFG) /tmp/openserctl.sqlbase \
+		$(BSD_INSTALL_DATA) /tmp/openserctl.sqlbase \
 			$(modules-prefix)/$(lib-dir)/openserctl/openserctl.sqlbase
 		rm -fr /tmp/openserctl.sqlbase
 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)unix
@@ -461,7 +429,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 \
@@ -474,7 +442,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
@@ -499,9 +467,7 @@
 			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" ; \
+				$(doc-prefix)/$(doc-dir)/README."$$r" ; \
 			fi ; \
 		fi ; \
 	done 
