1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
|
--- Makefile.orig Sun Mar 5 19:40:19 2006
+++ Makefile Sun Mar 5 20:40:04 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 pa postgres mysql \
+exclude_modules?= jabber $(POSTGRESQL) $(MYSQL) \
avp_radius auth_radius group_radius uri_radius
# always exclude the CVS dir
override exclude_modules+= CVS $(skip_modules)
@@ -320,21 +320,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
#$(INSTALL-CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)
if [ -z $(TLS) ]; then \
echo "No TLS scripts installed" ; \
@@ -345,25 +333,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) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
- $(INSTALL-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
- $(INSTALL) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
- $(INSTALL-TOUCH) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
- $(INSTALL) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
- $(INSTALL-TOUCH) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
- $(INSTALL) 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) 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) 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) 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) 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) 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/$(NAME)unix/$(NAME)unix
@@ -372,17 +342,17 @@
sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
< scripts/sc > /tmp/$(NAME)ctl
$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)ctl
- $(INSTALL-BIN) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
+ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
rm -fr /tmp/$(NAME)ctl
sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#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
sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
< scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh
$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh
- $(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
+ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
rm -fr /tmp/$(NAME)_postgresql.sh
@@ -431,9 +401,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
|