rpmbuildエラー対処

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

diff --git a/doc/conf/Makefile.am b/doc/conf/Makefile.am
index c524ed1..432608a 100644 (file)
--- 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

diff --git a/doc/moduledevel/sample/protocol/Makefile.am b/doc/moduledevel/sample/protocol/Makefile.am
index 66b6a3e..6d66a12 100644 (file)
--- 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

diff --git a/doc/moduledevel/sample/schedule/Makefile.am b/doc/moduledevel/sample/schedule/Makefile.am
index 80a2aec..d1888ab 100644 (file)
--- 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

diff --git a/doc/sslfiles/Makefile.am b/doc/sslfiles/Makefile.am
index 54c4f88..1917cc9 100644 (file)
--- 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

diff --git a/l7directord/Makefile.am b/l7directord/Makefile.am
index c25d3c8..2a18205 100644 (file)
--- a/l7directord/Makefile.am
+++ b/l7directord/Makefile.am
@@ -4,5 +4,5 @@ SBINDIR = @sbindir@
 
 install:
        $(INSTALL) -m 755 -D ./l7directord $(SBINDIR)/l7directord
-       $(INSTALL) -m 755 -D ./init.d/l7directord $(sysconfdir)/l7directord
+       $(INSTALL) -m 755 -D ./init.d/l7directord ${sysconfdir}/init.d/l7directord