Commit: 24ff53c5bd698c5e68e4ab663b1081540e494df7 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revision: 24ff53c5bd698c5e68e4ab663b1081540e494df7 (tree)
• Time: 2013-07-31 11:43:20
• Author: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

#31802 l7vs.cfが読み込めずにFATALエラーになる

l7vs.cfが指定のディレクトリに存在するにも関わらず、
/etc/init.d/l7vsd startを行うとFATALエラーになる。

ディレクトリ名を設定ファイルとして読み込むようになっていたので、
設定ファイル名 l7vs.cf を Makefile.am で補完した。

rpmbuildエラー対処

Change Summary

• modified: configure.in
• modified: doc/conf/Makefile.am
• modified: doc/heartbeat-ra/Makefile.am
• modified: doc/mibs/Makefile.am
• modified: doc/moduledevel/sample/protocol/Makefile.am
• modified: doc/moduledevel/sample/schedule/Makefile.am
• modified: doc/sslfiles/Makefile.am
• modified: l7directord/Makefile.am
• modified: l7vsd/init.d/Makefile.am
• modified: l7vsd/src/Makefile.am
• modified: ultramonkeyl7.spec

Incremental Difference

--- a/configure.in
+++ b/configure.in
@@ -50,15 +50,6 @@ AC_FUNC_MKTIME
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([gethostname localtime_r memset])
 
-# application-specific option
-#if test `uname -m` == "x86_64"; then
-#	AC_SUBST( libdir, [/usr/lib64] )
-#else
-#	AC_SUBST( libdir, [/usr/lib] )
-#	AC_SUBST( CXXFLAGS, -march=i686 )
-#fi
-#AC_SUBST( includedir, [${prefix}/include] )
-
 AC_ARG_WITH(
 	l7vs-moddir,
 	[	--with-l7vs-moddir=DIR	l7vs module is to be installed in DIR.
@@ -102,7 +93,6 @@ AC_ARG_WITH(
 )
 
 AC_SUBST(CC,g++)
-#AC_SUBST(exec_prefix, [/usr] )
 AC_SUBST(l7vsadm_sockdir)
 AC_SUBST(l7vs_moddir)
 AC_SUBST(l7vs_includedir) 

--- a/doc/conf/Makefile.am
+++ b/doc/conf/Makefile.am
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
 L7VS_CONF_DIR       = @l7vs_config@
-L7DIRECTORD_CONFDIR = @sysconfdir@/ha.d/conf
-L7VS_SSL_CONFDIR    = @sysconfdir@/l7vs/sslproxy
-L7DIRECTORD_LOGROTATEDIR = @sysconfdir@/logrotate.d
+L7DIRECTORD_CONFDIR = ${sysconfdir}/ha.d/conf
+L7VS_SSL_CONFDIR    = ${sysconfdir}/l7vs/sslproxy
+L7DIRECTORD_LOGROTATEDIR = ${sysconfdir}/logrotate.d
 
 install:
 	$(INSTALL) -b -m 644 -D ./l7vs.cf $(L7VS_CONF_DIR)/l7vs.cf

--- a/doc/heartbeat-ra/Makefile.am
+++ b/doc/heartbeat-ra/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 UML7_VERSION = @ultramonkeyl7_version@
-HB2_TEMPDIR  = @prefix@/share/doc/$(UML7_VERSION)/heartbeat-ra
+HB2_TEMPDIR  = ${prefix}/share/doc/$(UML7_VERSION)/heartbeat-ra
 
 install:
 	$(INSTALL) -b -m 644 -D ./logd.cf $(HB2_TEMPDIR)/logd.cf

--- a/doc/mibs/Makefile.am
+++ b/doc/mibs/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 UML7_VERSION = @ultramonkeyl7_version@
-L7VS_SNMP_MIBSDIR= @prefix@/share/doc/$(UML7_VERSION)/mibs
+L7VS_SNMP_MIBSDIR= ${prefix}/share/doc/$(UML7_VERSION)/mibs
 
 install:
 	$(INSTALL) -b -m 644 -D ./ULTRAMONKEY-L7-MIB.txt $(L7VS_SNMP_MIBSDIR)/ULTRAMONKEY-L7-MIB.txt

--- a/doc/moduledevel/sample/protocol/Makefile.am
+++ b/doc/moduledevel/sample/protocol/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 UML7_VERSION = @ultramonkeyl7_version@
-MODDEV_TEMPDIR = @prefix@/share/doc/${UML7_VERSION}/moduledevel
+MODDEV_TEMPDIR = ${prefix}/share/doc/${UML7_VERSION}/moduledevel
 
 install:
 	install -c -m 644 -D ./README ${MODDEV_TEMPDIR}/sample/protocol/README

--- a/doc/moduledevel/sample/schedule/Makefile.am
+++ b/doc/moduledevel/sample/schedule/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 UML7_VERSION = @ultramonkeyl7_version@
-MODDEV_TEMPDIR = @prefix@/share/doc/${UML7_VERSION}/moduledevel
+MODDEV_TEMPDIR = ${prefix}/share/doc/${UML7_VERSION}/moduledevel
 
 install:
 	install -c -m 644 -D ./README ${MODDEV_TEMPDIR}/sample/schedule/README

--- a/doc/sslfiles/Makefile.am
+++ b/doc/sslfiles/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-L7VS_SSL_CONFDIR = @sysconfdir@/l7vs/sslproxy
+L7VS_SSL_CONFDIR = ${sysconfdir}/l7vs/sslproxy
 
 install:
 	$(INSTALL) -b -m 644 -D ./root.pem $(L7VS_SSL_CONFDIR)/root.pem

--- a/l7directord/Makefile.am
+++ b/l7directord/Makefile.am
@@ -1,9 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
 SBINDIR = @sbindir@
-RCDIR   = @sysconfdir@/init.d
 
 install:
 	$(INSTALL) -m 755 -D ./l7directord $(SBINDIR)/l7directord
-	$(INSTALL) -m 755 -D ./init.d/l7directord $(RCDIR)/l7directord
+	$(INSTALL) -m 755 -D ./init.d/l7directord ${sysconfdir}/init.d/l7directord
 

--- a/l7vsd/init.d/Makefile.am
+++ b/l7vsd/init.d/Makefile.am
@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
 
 install:
-	$(INSTALL) -m 755 -D ./l7vsd @sysconfdir@/init.d/l7vsd
+	$(INSTALL) -m 755 -D ./l7vsd ${sysconfdir}/init.d/l7vsd

--- a/l7vsd/src/Makefile.am
+++ b/l7vsd/src/Makefile.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES = \
 	libl7vsd_logger.a \
 	libl7vsadm_logger.a
 
-PARAMETER_FILE = @l7vs_config@
+PARAMETER_FILE = @l7vs_config@/l7vs.cf
 
 libl7vsd_parameter_a_SOURCES = \
 	../include/parameter_enum.h \

--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -48,14 +48,11 @@ for UltraMonkeyl7's module.
 %setup -q
 
 %build
-%configure \
-        --prefix=${RPM_BUILD_ROOT}%{_prefix} \
-        --sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
-        --sysconfdir=${RPM_BUILD_ROOT}%{_sysconfdir} \
-        --localstatedir=${RPM_BUILD_ROOT}%{_localstatedir} \
-	--mandir=${RPM_BUILD_ROOT}%{_mandir} \
-        --includedir=${RPM_BUILD_ROOT}%{_includedir} \
-        --libdir=${RPM_BUILD_ROOT}%{_libdir}
+./configure \
+	--prefix=%{_prefix} \
+	--sysconfdir=%{_sysconfdir} \
+	--localstatedir=%{_localstatedir} \
+	--libdir=%{_libdir}
 
 make %{?_smp_mflags}
 
@@ -76,7 +73,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p ${RPM_BUILD_ROOT}%{moduledevel_tempdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
 
-make install 
+%makeinstall \
+	L7VS_CONF_DIR=${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs \
+	L7VS_MODDIR=${RPM_BUILD_ROOT}%{l7vs_moddir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT