From: root <root@devenv.(none)>
Date: Wed, 11 Sep 2013 04:50:54 +0000 (+0900)
Subject: prefix等の組み込みconfigure, makeオプションが
X-Git-Url: http://git.osdn.net/view?p=ultramonkey-l7%2Fultramonkey-l7-mod-url.git;a=commitdiff_plain;h=c3accb0d2aa38d0999b7eac79ce9d85c5150beec

prefix等の組み込みconfigure, makeオプションが
反映されるようにした。
その結果、make installでインストールする場合、configure
でオプションを指定しなければすべて/usr/local配下に
インストールされるようになった。
->すなわち、本体(ultramonkey-l7-v3)の
　コミット578be2b2415558b5ad8dfd59348143f343c3a12fへの追従。
---

diff --git a/configure.in b/configure.in
index 47f4fec..79309f9 100644
--- a/configure.in
+++ b/configure.in
@@ -50,20 +50,12 @@ 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, [/usr/include] )
 
 AC_ARG_WITH(
 	l7vs-moddir,
 	[	--with-l7vs-moddir=DIR	l7vs module is to be installed in DIR.
-								[default=LIBDIR/l7vs] ],
+								[default=${libdir}/l7vs] ],
 	[	l7vs_moddir="$withval" ],
 	[	l7vs_moddir="${libdir}/l7vs" ]
 )
@@ -71,17 +63,17 @@ AC_ARG_WITH(
 AC_ARG_WITH(
         l7vs-includedir,
         [       --with-l7vs-includedir=DIR      l7vs headerfile is to be installed in DIR.
-                                                                [default=INCLUDEDIR/l7vs] ],
+                                                                [default=${includedir}/l7vs]
+],
         [       l7vs_includedir="$withval" ],
-        [       l7vs_includedir="${includedir}/l7vs" ]
-)
+        [       l7vs_includedir="${includedir}/l7vs" ])
 
 AC_ARG_WITH(
 	l7vsadm-sockdir,
 	[	--with-l7vsadm-sockdir=DIR	l7vsadm sockfile PATH.
-									[default=/var/run/l7vs] ],
+									[default=${localstatedir}/run/l7vs] ],
 	[	l7vsadm_sockdir="$withval" ],
-	[	l7vsadm_sockdir="/var/run/l7vs" ]
+	[	l7vsadm_sockdir="${localstatedir}/run/l7vs" ]
 )
 
 AC_ARG_WITH(
@@ -97,11 +89,10 @@ AC_ARG_WITH(
 	[	--with-l7vs-config-dir=DIR	l7vs configfile PATH.
 									[default=/etc/l7vs/l7vs.cf] ],
 	[	l7vs_config="$withval" ],
-	[	l7vs_config="/etc/l7vs/l7vs.cf"	]
+	[	l7vs_config="${sysconfdir}/l7vs"	]
 )
 
 AC_SUBST(CC,g++)
-AC_SUBST(exec_prefix, [/usr] )
 AC_SUBST(l7vsadm_sockdir)
 AC_SUBST(l7vs_moddir)
 AC_SUBST(l7vs_includedir)
diff --git a/ultramonkeyl7-mod-url.spec b/ultramonkeyl7-mod-url.spec
index ff1c96d..1a27eb5 100644
--- a/ultramonkeyl7-mod-url.spec
+++ b/ultramonkeyl7-mod-url.spec
@@ -27,7 +27,12 @@ URL module for ultramonkey-l7
 
 %build
 %configure
-make
+	--prefix=%{_prefix} \
+	--sysconfdir=%{_sysconfdir} \
+	--localstatedir=%{_localstatedir} \
+	--libdir=%{_libdir}
+
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}