Protocol Moudule URL for UltraMonkey-L7 V3(This is add on Module)
| 修訂 | c3accb0d2aa38d0999b7eac79ce9d85c5150beec (tree) |
|---|---|
| 時間 | 2013-09-11 13:55:48 |
| 作者 | root <root@deve...> |
| Commiter | root |
prefix等の組み込みconfigure, makeオプションが
反映されるようにした。
その結果、make installでインストールする場合、configure
でオプションを指定しなければすべて/usr/local配下に
インストールされるようになった。
->すなわち、本体(ultramonkey-l7-v3)の
コミット578be2b2415558b5ad8dfd59348143f343c3a12fへの追従。
configure.in (diff) ultramonkeyl7-mod-url.spec (diff)| @@ -50,20 +50,12 @@ AC_FUNC_MKTIME | ||
| 50 | 50 | AC_FUNC_STRFTIME |
| 51 | 51 | AC_CHECK_FUNCS([gethostname localtime_r memset]) |
| 52 | 52 | |
| 53 | -# 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 | - | |
| 61 | 53 | AC_SUBST( includedir, [/usr/include] ) |
| 62 | 54 | |
| 63 | 55 | AC_ARG_WITH( |
| 64 | 56 | l7vs-moddir, |
| 65 | 57 | [ --with-l7vs-moddir=DIR l7vs module is to be installed in DIR. |
| 66 | - [default=LIBDIR/l7vs] ], | |
| 58 | + [default=${libdir}/l7vs] ], | |
| 67 | 59 | [ l7vs_moddir="$withval" ], |
| 68 | 60 | [ l7vs_moddir="${libdir}/l7vs" ] |
| 69 | 61 | ) |
| @@ -71,17 +63,17 @@ AC_ARG_WITH( | ||
| 71 | 63 | AC_ARG_WITH( |
| 72 | 64 | l7vs-includedir, |
| 73 | 65 | [ --with-l7vs-includedir=DIR l7vs headerfile is to be installed in DIR. |
| 74 | - [default=INCLUDEDIR/l7vs] ], | |
| 66 | + [default=${includedir}/l7vs] | |
| 67 | +], | |
| 75 | 68 | [ l7vs_includedir="$withval" ], |
| 76 | - [ l7vs_includedir="${includedir}/l7vs" ] | |
| 77 | -) | |
| 69 | + [ l7vs_includedir="${includedir}/l7vs" ]) | |
| 78 | 70 | |
| 79 | 71 | AC_ARG_WITH( |
| 80 | 72 | l7vsadm-sockdir, |
| 81 | 73 | [ --with-l7vsadm-sockdir=DIR l7vsadm sockfile PATH. |
| 82 | - [default=/var/run/l7vs] ], | |
| 74 | + [default=${localstatedir}/run/l7vs] ], | |
| 83 | 75 | [ l7vsadm_sockdir="$withval" ], |
| 84 | - [ l7vsadm_sockdir="/var/run/l7vs" ] | |
| 76 | + [ l7vsadm_sockdir="${localstatedir}/run/l7vs" ] | |
| 85 | 77 | ) |
| 86 | 78 | |
| 87 | 79 | AC_ARG_WITH( |
| @@ -97,11 +89,10 @@ AC_ARG_WITH( | ||
| 97 | 89 | [ --with-l7vs-config-dir=DIR l7vs configfile PATH. |
| 98 | 90 | [default=/etc/l7vs/l7vs.cf] ], |
| 99 | 91 | [ l7vs_config="$withval" ], |
| 100 | - [ l7vs_config="/etc/l7vs/l7vs.cf" ] | |
| 92 | + [ l7vs_config="${sysconfdir}/l7vs" ] | |
| 101 | 93 | ) |
| 102 | 94 | |
| 103 | 95 | AC_SUBST(CC,g++) |
| 104 | -AC_SUBST(exec_prefix, [/usr] ) | |
| 105 | 96 | AC_SUBST(l7vsadm_sockdir) |
| 106 | 97 | AC_SUBST(l7vs_moddir) |
| 107 | 98 | AC_SUBST(l7vs_includedir) |
| @@ -27,7 +27,12 @@ URL module for ultramonkey-l7 | ||
| 27 | 27 | |
| 28 | 28 | %build |
| 29 | 29 | %configure |
| 30 | -make | |
| 30 | + --prefix=%{_prefix} \ | |
| 31 | + --sysconfdir=%{_sysconfdir} \ | |
| 32 | + --localstatedir=%{_localstatedir} \ | |
| 33 | + --libdir=%{_libdir} | |
| 34 | + | |
| 35 | +make %{?_smp_mflags} | |
| 31 | 36 | |
| 32 | 37 | %install |
| 33 | 38 | rm -rf ${RPM_BUILD_ROOT} |
UltraMonkey-L7
Fork