OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision31ddc71ba39f5cb3dca87e6a246a7c18ea37e95e (tree)
Time2013-07-12 17:14:45
AuthorHiroaki Nakano <nakano.hiroaki@nttc...>
CommiterHiroaki Nakano

Log Message

configure.inおよびMakefile.amよりFull Path指定を
排除。prefix等の組み込みconfigure, makeオプションが
反映されるようにした。
その結果、make installでインストールする場合、configure
でオプションを指定しなければすべて/usr/local配下に
インストールされるようになった。

上記修正のうえ、sample.crmおよびmanがrpmでインストールされない
問題を修正した。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Change Summary

Incremental Difference

--- a/configure.in
+++ b/configure.in
@@ -51,27 +51,27 @@ AC_FUNC_STRFTIME
5151 AC_CHECK_FUNCS([gethostname localtime_r memset])
5252
5353 # application-specific option
54-if test `uname -m` == "x86_64"; then
55- AC_SUBST( libdir, [/usr/lib64] )
56-else
57- AC_SUBST( libdir, [/usr/lib] )
58- AC_SUBST( CXXFLAGS, -march=i686 )
59-fi
60-AC_SUBST( includedir, [/usr/include] )
54+#if test `uname -m` == "x86_64"; then
55+# AC_SUBST( libdir, [/usr/lib64] )
56+#else
57+# AC_SUBST( libdir, [/usr/lib] )
58+# AC_SUBST( CXXFLAGS, -march=i686 )
59+#fi
60+#AC_SUBST( includedir, [${prefix}/include] )
6161
6262 AC_ARG_WITH(
6363 l7vs-moddir,
6464 [ --with-l7vs-moddir=DIR l7vs module is to be installed in DIR.
65- [default=LIBDIR/l7vs] ],
65+ [default=${libdir}/l7vs] ],
6666 [ l7vs_moddir="$withval" ],
6767 [ l7vs_moddir="${libdir}/l7vs" ]
6868 )
6969
7070 AC_ARG_WITH(
7171 l7vs-includedir,
72- [ --with-l7vs-includedir=DIR l7vs headerfile is to be installed in DIR.
72+ [ --with-l7vs-includedir=DIR l7vs headerfile is to be installed in DIR.
7373
74- [default=INCLUDEDIR/l7vs]
74+ [default=${includedir}/l7vs]
7575 ],
7676 [ l7vs_includedir="$withval" ],
7777 [ l7vs_includedir="${includedir}/l7vs" ]
@@ -80,9 +80,9 @@ AC_ARG_WITH(
8080 AC_ARG_WITH(
8181 l7vsadm-sockdir,
8282 [ --with-l7vsadm-sockdir=DIR l7vsadm sockfile PATH.
83- [default=/var/run/l7vs] ],
83+ [default=${localstatedir}/run/l7vs] ],
8484 [ l7vsadm_sockdir="$withval" ],
85- [ l7vsadm_sockdir="/var/run/l7vs" ]
85+ [ l7vsadm_sockdir="${localstatedir}/run/l7vs" ]
8686 )
8787
8888 AC_ARG_WITH(
@@ -96,13 +96,13 @@ AC_ARG_WITH(
9696 AC_ARG_WITH(
9797 l7vs-config-dir,
9898 [ --with-l7vs-config-dir=DIR l7vs configfile PATH.
99- [default=/etc/l7vs/l7vs.cf] ],
99+ [default=${sysconfdir}/l7vs] ],
100100 [ l7vs_config="$withval" ],
101- [ l7vs_config="/etc/l7vs/l7vs.cf" ]
101+ [ l7vs_config="${sysconfdir}/l7vs" ]
102102 )
103103
104104 AC_SUBST(CC,g++)
105-AC_SUBST(exec_prefix, [/usr] )
105+#AC_SUBST(exec_prefix, [/usr] )
106106 AC_SUBST(l7vsadm_sockdir)
107107 AC_SUBST(l7vs_moddir)
108108 AC_SUBST(l7vs_includedir)
--- a/doc/conf/Makefile.am
+++ b/doc/conf/Makefile.am
@@ -1,12 +1,12 @@
11 AUTOMAKE_OPTIONS = foreign
22
33 L7VS_CONF_DIR = @l7vs_config@
4-L7DIRECTORD_CONFDIR = /etc/ha.d/conf
5-L7VS_SSL_CONFDIR = /etc/l7vs/sslproxy
6-L7DIRECTORD_LOGROTATEDIR = /etc/logrotate.d
4+L7DIRECTORD_CONFDIR = @sysconfdir@/ha.d/conf
5+L7VS_SSL_CONFDIR = @sysconfdir@/l7vs/sslproxy
6+L7DIRECTORD_LOGROTATEDIR = @sysconfdir@/logrotate.d
77
88 install:
9- $(INSTALL) -b -m 644 -D ./l7vs.cf $(L7VS_CONF_DIR)
9+ $(INSTALL) -b -m 644 -D ./l7vs.cf $(L7VS_CONF_DIR)/l7vs.cf
1010 $(INSTALL) -m 644 -D ./l7directord.cf.sample $(L7DIRECTORD_CONFDIR)/l7directord.cf.sample
1111 $(INSTALL) -b -m 644 -D ./sslproxy.target.cf $(L7VS_SSL_CONFDIR)/sslproxy.target.cf
1212 $(INSTALL) -m 644 -D ./l7directord $(L7DIRECTORD_LOGROTATEDIR)/l7directord
--- a/doc/heartbeat-ra/Makefile.am
+++ b/doc/heartbeat-ra/Makefile.am
@@ -1,7 +1,7 @@
11 AUTOMAKE_OPTIONS = foreign
22
33 UML7_VERSION = @ultramonkeyl7_version@
4-HB2_TEMPDIR = /usr/share/doc/$(UML7_VERSION)/heartbeat-ra
4+HB2_TEMPDIR = @prefix@/share/doc/$(UML7_VERSION)/heartbeat-ra
55
66 install:
77 $(INSTALL) -b -m 644 -D ./logd.cf $(HB2_TEMPDIR)/logd.cf
--- a/doc/heartbeat-ra/sample.crm
+++ b/doc/heartbeat-ra/sample.crm
@@ -37,34 +37,34 @@ group grpUltraMonkey \
3737 ### Primitive Configuration ###
3838 primitive prmVIPcheck ocf:heartbeat:VIPcheck \
3939 params \
40- target_ip="" \
40+ target_ip="MODIFY_TARGET_VIP" \
4141 count="1" \
4242 wait="10" \
43- op start interval="0s" timeout="90s" on-fail="restart" start_delay="4s“
43+ op start interval="0s" timeout="90s" on-fail="restart" start_delay="4s"
4444
45-primitive prmVIP1 ocf:heartbeat:IPaddr2 \
45+primitive prmVIP ocf:heartbeat:IPaddr2 \
4646 params \
47- ip="" \
48- nic="" \
49- cidr_netmask="" \
47+ ip="MODIFY_VIP_IP" \
48+ nic="MODIFY_VIP_NIC" \
49+ cidr_netmask="MODIFY_VIP_NETMASK" \
5050 op start interval="0s" timeout="60s" on-fail="restart" \
5151 op monitor interval="10s" timeout="60s" on-fail="restart" \
52- op stop interval="0s" timeout="60s" on-fail="fence"
52+ op stop interval="0s" timeout="60s" on-fail="block"
5353
5454 primitive prmL7directord ocf:heartbeat:L7directord \
5555 op start interval="0s" timeout="60s" on-fail="restart" \
5656 op monitor interval="10s" timeout="60s" on-fail="restart" \
57- op stop interval="0s" timeout="60s" on-fail="fence"
57+ op stop interval="0s" timeout="60s" on-fail="block"
5858
5959 primitive prmL7vsd ocf:heartbeat:L7vsd \
6060 op start interval="0s" timeout="60s" on-fail="restart" \
6161 op monitor interval="10s" timeout="60s" on-fail="restart" \
62- op stop interval="0s" timeout="60s" on-fail="fence"
62+ op stop interval="0s" timeout="60s" on-fail="block"
6363
6464 primitive prmPingd ocf:pacemaker:pingd \
6565 params \
6666 name="default_ping_set" \
67- host_list="" \
67+ host_list="MODIFY_PING_TARGET_IP" \
6868 multiplier="100" \
6969 op start interval="0s" timeout="60s" on-fail="restart" \
7070 op monitor interval="10s" timeout="60s" on-fail="restart" \
@@ -73,7 +73,7 @@ primitive prmPingd ocf:pacemaker:pingd \
7373 primitive prmDiskd ocf:pacemaker:diskd \
7474 params \
7575 name="diskcheck_status_internal" \
76- device="" \
76+ device="MODIFY_TARGET_DISK_DEV" \
7777 interval="10" \
7878 op start interval="0s" timeout="60s" on-fail="restart" \
7979 op monitor interval="10s" timeout="60s" on-fail="restart" \
@@ -83,8 +83,8 @@ primitive prmDiskd ocf:pacemaker:diskd \
8383 # params \
8484 # priority="1" \
8585 # stonith-timeout="40s" \
86-# hostlist="" \
87-# dead_check_target="" \
86+# hostlist="MODIFY_PRYMARY_HOST" \
87+# dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
8888 # standby_check_command="/usr/sbin/crm_resource -r prmVIP -W | grep -q `hostname`" \
8989 # op start interval="0s" timeout="60s" \
9090 # op monitor interval="10s" timeout="60s" \
@@ -92,12 +92,12 @@ primitive prmDiskd ocf:pacemaker:diskd \
9292
9393 #primitive prmStonith1-2 stonith:external/ipmi \
9494 # params \
95-# passwd="" \
96-# ipaddr="" \
95+# passwd="MODIFY_IPMI_PASSWORD" \
96+# ipaddr="MODIFY_IPMI_IP" \
9797 # priority="2" \
98-# userid="" \
99-# hostname="" \
100-# interface="" \
98+# userid="MODIFY_IPMI_USER" \
99+# hostname="MODIFY_PRYMARY_HOST" \
100+# interface="MODIFY_IPMI_INTERFACE" \
101101 # stonith-timeout="60s" \
102102 # op start interval="0s" timeout="60s" \
103103 # op monitor interval="3600s" timeout="60s" \
@@ -107,7 +107,7 @@ primitive prmDiskd ocf:pacemaker:diskd \
107107 # params \
108108 # priority="3" \
109109 # stonith-timeout="600s" \
110-# hostlist="" \
110+# hostlist="MODIFY_PRYMARY_HOST" \
111111 # op start interval="0s" timeout="60s" \
112112 # op monitor interval="3600s" timeout="60s" \
113113 # op stop interval="0s" timeout="60s"
@@ -116,8 +116,8 @@ primitive prmDiskd ocf:pacemaker:diskd \
116116 # params \
117117 # priority="1" \
118118 # stonith-timeout="40s" \
119-# hostlist="" \
120-# dead_check_target="" \
119+# hostlist="MODIFY_SECONDARY_HOST" \
120+# dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
121121 # standby_check_command="/usr/sbin/crm_resource -r prmVIP -W | grep -q `hostname`" \
122122 # op start interval="0s" timeout="60s" \
123123 # op monitor interval="10s" timeout="60s" \
@@ -125,12 +125,12 @@ primitive prmDiskd ocf:pacemaker:diskd \
125125
126126 #primitive prmStonith2-2 stonith:external/ipmi \
127127 # params \
128-# passwd="" \
129-# ipaddr="" \
128+# passwd="MODIFY_IPMI_PASSWORD" \
129+# ipaddr="MODIFY_IPMI_IP" \
130130 # priority="2" \
131-# userid="" \
132-# hostname="" \
133-# interface="" \
131+# userid="MODIFY_IPMI_USER" \
132+# hostname="MODIFY_SECONDARY_HOST" \
133+# interface="MODIFY_IPMI_INTERFACE" \
134134 # stonith-timeout="60s" \
135135 # op start interval="0s" timeout="60s" \
136136 # op monitor interval="3600s" timeout="60s" \
@@ -140,21 +140,21 @@ primitive prmDiskd ocf:pacemaker:diskd \
140140 # params \
141141 # priority="3" \
142142 # stonith-timeout="600s" \
143-# hostlist="" \
143+# hostlist="MODIFY_SECONDARY_HOST" \
144144 # op start interval="0s" timeout="60s" \
145145 # op monitor interval="3600s" timeout="60s" \
146146 # op stop interval="0s" timeout="60s"
147147
148148 ### Resource Location ###
149149 location rsc_location-grpUltraMonkey-1 grpUltraMonkey \
150- rule 200: #uname eq \
151- rule 100: #uname eq \
150+ rule 200: #uname eq MODIFY_PRYMARY_HOST \
151+ rule 100: #uname eq MODIFY_SECONDARY_HOST \
152152 rule -INFINITY: not_defined default_ping_set or default_ping_set lt 100 \
153153 rule -INFINITY: not_defined diskcheck_status_internal or diskcheck_status_internal eq ERROR
154154 #location rsc_location-grpStonith1-2 grpStonith1 \
155-# rule -INFINITY: #uname eq
155+# rule -INFINITY: #uname eq MODIFY_PRYMARY_HOST
156156 #location rsc_location-grpStonith2-3 grpStonith2 \
157-# rule -INFINITY: #uname eq
157+# rule -INFINITY: #uname eq MODIFY_SECONDARY_HOST
158158
159159 ### Resource Colocation ###
160160 colocation rsc_colocation-grpUltraMonkey-clnPingd-1 INFINITY: grpUltraMonkey clnPingd
--- a/doc/mibs/Makefile.am
+++ b/doc/mibs/Makefile.am
@@ -1,7 +1,7 @@
11 AUTOMAKE_OPTIONS = foreign
22
33 UML7_VERSION = @ultramonkeyl7_version@
4-L7VS_SNMP_MIBSDIR= /usr/share/doc/$(UML7_VERSION)/mibs
4+L7VS_SNMP_MIBSDIR= @prefix@/share/doc/$(UML7_VERSION)/mibs
55
66 install:
77 $(INSTALL) -b -m 644 -D ./ULTRAMONKEY-L7-MIB.txt $(L7VS_SNMP_MIBSDIR)/ULTRAMONKEY-L7-MIB.txt
--- a/doc/sslfiles/Makefile.am
+++ b/doc/sslfiles/Makefile.am
@@ -1,6 +1,6 @@
11 AUTOMAKE_OPTIONS = foreign
22
3-L7VS_SSL_CONFDIR = /etc/l7vs/sslproxy
3+L7VS_SSL_CONFDIR = @sysconfdir@/l7vs/sslproxy
44
55 install:
66 $(INSTALL) -b -m 644 -D ./root.pem $(L7VS_SSL_CONFDIR)/root.pem
--- a/l7directord/Makefile.am
+++ b/l7directord/Makefile.am
@@ -1,7 +1,7 @@
11 AUTOMAKE_OPTIONS = foreign
22
33 SBINDIR = @sbindir@
4-RCDIR = /etc/init.d
4+RCDIR = @sysconfdir@/init.d
55
66 install:
77 $(INSTALL) -m 755 -D ./l7directord $(SBINDIR)/l7directord
--- a/l7vsd/init.d/Makefile.am
+++ b/l7vsd/init.d/Makefile.am
@@ -1,4 +1,4 @@
11 AUTOMAKE_OPTIONS = foreign
22
33 install:
4- $(INSTALL) -m 755 -D ./l7vsd /etc/init.d/l7vsd
4+ $(INSTALL) -m 755 -D ./l7vsd @sysconfdir@/init.d/l7vsd