SSL関連ファイル用Makefile修正

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9199 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/doc/Makefile.am b/doc/Makefile.am
index df5bc5a..b7ed051 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,12 +2,13 @@ AUTOMAKE_OPTIONS      = foreign
 
 L7VS_CONF_DIR  = @l7vs_config@
 L7DIRECTORD_CONFDIR    = /etc/ha.d/conf
+L7VS_SSL_CONFDIR       = /etc/l7vs/sslproxy
 
 install:
        $(INSTALL) -b -m 644 -D ./conf/l7vs.cf $(L7VS_CONF_DIR)
        $(INSTALL) -m 644 -D ./conf/l7directord.cf.sample $(L7DIRECTORD_CONFDIR)/l7directord.cf.sample
-       $(INSTALL) -b -m 644 -D ./conf/sslproxy.target.cf $(L7VS_CONF_DIR)/sslproxy/sslproxy.target.cf
-       $(INSTALL) -b -m 644 -D ./sslfiles/root.pem $(L7VS_CONF_DIR)/sslproxy/root.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/server.pem $(L7VS_CONF_DIR)/sslproxy/server.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/dh512.pem $(L7VS_CONF_DIR)/sslproxy/dh512.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/passwd.txt $(L7VS_CONF_DIR)/sslproxy/passwd.txt
+       $(INSTALL) -b -m 644 -D ./conf/sslproxy.target.cf $(L7VS_SSL_CONFDIR)/sslproxy.target.cf
+       $(INSTALL) -b -m 644 -D ./sslfiles/root.pem $(L7VS_SSL_CONFDIR)/root.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/server.pem $(L7VS_SSL_CONFDIR)/server.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/dh512.pem $(L7VS_SSL_CONFDIR)/dh512.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/passwd.txt $(L7VS_SSL_CONFDIR)/passwd.txt

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e17dfa9..3dc8e80 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -153,6 +153,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 L7VS_CONF_DIR = @l7vs_config@
 L7DIRECTORD_CONFDIR = /etc/ha.d/conf
+L7VS_SSL_CONFDIR = /etc/l7vs/sslproxy
 all: all-am
 
 .SUFFIXES:
@@ -316,11 +317,11 @@ uninstall-am: uninstall-info-am
 install:
        $(INSTALL) -b -m 644 -D ./conf/l7vs.cf $(L7VS_CONF_DIR)
        $(INSTALL) -m 644 -D ./conf/l7directord.cf.sample $(L7DIRECTORD_CONFDIR)/l7directord.cf.sample
-       $(INSTALL) -b -m 644 -D ./conf/sslproxy.target.cf $(L7VS_CONF_DIR)/sslproxy/sslproxy.target.cf
-       $(INSTALL) -b -m 644 -D ./sslfiles/root.pem $(L7VS_CONF_DIR)/sslproxy/root.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/server.pem $(L7VS_CONF_DIR)/sslproxy/server.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/dh512.pem $(L7VS_CONF_DIR)/sslproxy/dh512.pem
-       $(INSTALL) -b -m 644 -D ./sslfiles/passwd.txt $(L7VS_CONF_DIR)/sslproxy/passwd.txt
+       $(INSTALL) -b -m 644 -D ./conf/sslproxy.target.cf $(L7VS_SSL_CONFDIR)/sslproxy.target.cf
+       $(INSTALL) -b -m 644 -D ./sslfiles/root.pem $(L7VS_SSL_CONFDIR)/root.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/server.pem $(L7VS_SSL_CONFDIR)/server.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/dh512.pem $(L7VS_SSL_CONFDIR)/dh512.pem
+       $(INSTALL) -b -m 644 -D ./sslfiles/passwd.txt $(L7VS_SSL_CONFDIR)/passwd.txt
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: