configure.inおよびMakefile.amよりFull Path指定を

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

上記修正のうえ、sample.crmおよびmanがrpmでインストールされない
問題を修正。
make installでパッケージに必要なすべてのファイルをインストール
するようにし、specファイルから個別インストールコマンドを排除。

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

diff --git a/configure.in b/configure.in
index f4eef72..c4c0cde 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,27 +51,27 @@ 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] )
+#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.
-                                                               [default=LIBDIR/l7vs] ],
+                                                               [default=${libdir}/l7vs] ],
        [       l7vs_moddir="$withval" ],
        [       l7vs_moddir="${libdir}/l7vs" ]
 )
 
 AC_ARG_WITH(
         l7vs-includedir,
-        [       --with-l7vs-includedir=DIR      l7vs headerfile is to be installed in DIR.
+        [        --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" ]
@@ -80,9 +80,9 @@ AC_ARG_WITH(
 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(
@@ -96,13 +96,13 @@ AC_ARG_WITH(
 AC_ARG_WITH(
        l7vs-config-dir,
        [       --with-l7vs-config-dir=DIR      l7vs configfile PATH.
-                                                                       [default=/etc/l7vs/l7vs.cf] ],
+                                                                       [default=${sysconfdir}/l7vs] ],
        [       l7vs_config="$withval" ],
-       [       l7vs_config="/etc/l7vs/l7vs.cf" ]
+       [       l7vs_config="${sysconfdir}/l7vs"        ]
 )
 
 AC_SUBST(CC,g++)
-AC_SUBST(exec_prefix, [/usr] )
+#AC_SUBST(exec_prefix, [/usr] )
 AC_SUBST(l7vsadm_sockdir)
 AC_SUBST(l7vs_moddir)
 AC_SUBST(l7vs_includedir) 
@@ -118,6 +118,10 @@ AC_CONFIG_FILES([doc/Makefile]
                 [doc/heartbeat-ra/Makefile]
                [doc/mibs/Makefile]
                [doc/man/Makefile]
+               [doc/moduledevel/Makefile]
+               [doc/moduledevel/sample/Makefile]
+               [doc/moduledevel/sample/protocol/Makefile]
+               [doc/moduledevel/sample/schedule/Makefile]
                 [l7directord/Makefile]
                 [l7vsd/Makefile]
                 [l7vsd/init.d/Makefile]
@@ -125,6 +129,7 @@ AC_CONFIG_FILES([doc/Makefile]
                 [l7vsd/module/protocol/Makefile]
                 [l7vsd/module/schedule/Makefile]
                 [l7vsd/src/Makefile]
+               [l7vsd/include/Makefile]
                 [Makefile])
 
 AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 139f613..703b57f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,2 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = conf sslfiles heartbeat-ra mibs man
+SUBDIRS = conf sslfiles heartbeat-ra mibs moduledevel man

diff --git a/doc/conf/Makefile.am b/doc/conf/Makefile.am
index 8b6ce03..c524ed1 100644 (file)
--- a/doc/conf/Makefile.am
+++ b/doc/conf/Makefile.am
@@ -1,12 +1,12 @@
 AUTOMAKE_OPTIONS = foreign
 
 L7VS_CONF_DIR       = @l7vs_config@
-L7DIRECTORD_CONFDIR = /etc/ha.d/conf
-L7VS_SSL_CONFDIR    = /etc/l7vs/sslproxy
-L7DIRECTORD_LOGROTATEDIR = /etc/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)
+       $(INSTALL) -b -m 644 -D ./l7vs.cf $(L7VS_CONF_DIR)/l7vs.cf
        $(INSTALL) -m 644 -D ./l7directord.cf.sample $(L7DIRECTORD_CONFDIR)/l7directord.cf.sample
        $(INSTALL) -b -m 644 -D ./sslproxy.target.cf $(L7VS_SSL_CONFDIR)/sslproxy.target.cf
        $(INSTALL) -m 644 -D ./l7directord $(L7DIRECTORD_LOGROTATEDIR)/l7directord

diff --git a/doc/heartbeat-ra/Makefile.am b/doc/heartbeat-ra/Makefile.am
index 4d21908..5727d5b 100644 (file)
--- 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  = /usr/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

diff --git a/doc/mibs/Makefile.am b/doc/mibs/Makefile.am
index acb9942..bfcece0 100644 (file)
--- a/doc/mibs/Makefile.am
+++ b/doc/mibs/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 UML7_VERSION = @ultramonkeyl7_version@
-L7VS_SNMP_MIBSDIR= /usr/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

diff --git a/doc/moduledevel/Makefile.am b/doc/moduledevel/Makefile.am
new file mode 100644 (file)
index 0000000..0466652
--- /dev/null
+++ b/doc/moduledevel/Makefile.am
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = sample

diff --git a/doc/moduledevel/sample/Makefile.am b/doc/moduledevel/sample/Makefile.am
new file mode 100644 (file)
index 0000000..f362edc
--- /dev/null
+++ b/doc/moduledevel/sample/Makefile.am
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = protocol schedule

diff --git a/doc/moduledevel/sample/protocol/Makefile.am b/doc/moduledevel/sample/protocol/Makefile.am
index a69d900..66b6a3e 100644 (file)
--- a/doc/moduledevel/sample/protocol/Makefile.am
+++ b/doc/moduledevel/sample/protocol/Makefile.am
@@ -1,24 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
-L7VS_MODDIR      = @l7vs_moddir@
-L7VS_INCLUDEDIR  = @l7vs_includedir@
-MAX_BUFFER_SIZE  = @l7vs_max_buffer_size@
 
-AM_CPPFLAGS      = \
-       -g -O2 -fno-strict-aliasing -Wall -Werror -fPIC -pthread \
-       -I$(L7VS_INCLUDEDIR) \
-       -DMAX_BUFFER_SIZE=$(MAX_BUFFER_SIZE)
-
-lib_LTLIBRARIES = \
-        libprotomod_simple.la
-
-libprotomod_simple_la_SOURCES = \
-       protocol_module_base.h \
-       http_protocol_module_base.h \
-       http_protocol_module_base.cpp \
-       protocol_module_simple.cpp
+UML7_VERSION = @ultramonkeyl7_version@
+MODDEV_TEMPDIR = @prefix@/share/doc/${UML7_VERSION}/moduledevel
 
 install:
-       cp ./.libs/libprotomod_simple.so ./.libs/protomod_simple.so && \
-       $(INSTALL) -m 755 -d $(L7VS_MODDIR)
-       $(INSTALL) -m 755 -D \
-               ./.libs/protomod_simple.so $(L7VS_MODDIR)
+       install -c -m 644 -D ./README ${MODDEV_TEMPDIR}/sample/protocol/README
+       install -c -m 644 -D ./Makefile.am.sample ${MODDEV_TEMPDIR}/sample/protocol/Makefile.am
+       install -c -m 644 -D ./configure.in ${MODDEV_TEMPDIR}/sample/protocol/configure.in
+       install -c -m 644 -D ./http_protocol_module_base.cpp ${MODDEV_TEMPDIR}/sample/protocol/http_protocol_module_base.cpp
+       install -c -m 644 -D ./http_protocol_module_base.h ${MODDEV_TEMPDIR}/sample/protocol/http_protocol_module_base.h
+       install -c -m 644 -D ./protocol_module_simple.cpp ${MODDEV_TEMPDIR}/sample/protocol/protocol_module_simple.cpp
+       install -c -m 644 -D ./protocol_module_simple.h ${MODDEV_TEMPDIR}/sample/protocol/protocol_module_simple.h

diff --git a/doc/moduledevel/sample/protocol/Makefile.am.sample b/doc/moduledevel/sample/protocol/Makefile.am.sample
new file mode 100644 (file)
index 0000000..a69d900
--- /dev/null
+++ b/doc/moduledevel/sample/protocol/Makefile.am.sample
@@ -0,0 +1,24 @@
+AUTOMAKE_OPTIONS = foreign
+L7VS_MODDIR      = @l7vs_moddir@
+L7VS_INCLUDEDIR  = @l7vs_includedir@
+MAX_BUFFER_SIZE  = @l7vs_max_buffer_size@
+
+AM_CPPFLAGS      = \
+       -g -O2 -fno-strict-aliasing -Wall -Werror -fPIC -pthread \
+       -I$(L7VS_INCLUDEDIR) \
+       -DMAX_BUFFER_SIZE=$(MAX_BUFFER_SIZE)
+
+lib_LTLIBRARIES = \
+        libprotomod_simple.la
+
+libprotomod_simple_la_SOURCES = \
+       protocol_module_base.h \
+       http_protocol_module_base.h \
+       http_protocol_module_base.cpp \
+       protocol_module_simple.cpp
+
+install:
+       cp ./.libs/libprotomod_simple.so ./.libs/protomod_simple.so && \
+       $(INSTALL) -m 755 -d $(L7VS_MODDIR)
+       $(INSTALL) -m 755 -D \
+               ./.libs/protomod_simple.so $(L7VS_MODDIR)

diff --git a/doc/moduledevel/sample/schedule/Makefile.am b/doc/moduledevel/sample/schedule/Makefile.am
index c799e9c..80a2aec 100644 (file)
--- a/doc/moduledevel/sample/schedule/Makefile.am
+++ b/doc/moduledevel/sample/schedule/Makefile.am
@@ -1,25 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
-L7VS_MODDIR      = @l7vs_moddir@
-L7VS_INCLUDEDIR  = @l7vs_includedir@
-MAX_BUFFER_SIZE  = @l7vs_max_buffer_size@
-AM_CPPFLAGS = \
-       -g -O2 -fno-strict-aliasing -Wall -Werror -fPIC -pthread \
-       -I$(L7VS_INCLUDEDIR) \
-       -DMAX_BUFFER_SIZE=$(MAX_BUFFER_SIZE)
 
-lib_LTLIBRARIES = \
-       libsched_rnd.la
-
-libsched_rnd_la_SOURCES = \
-       schedule_module_base.h \
-       schedule_module_rnd.h \
-       schedule_module_rnd.cpp
-
-libsched_rnd_la_LIBADD = -lrt -lboost_thread-mt
+UML7_VERSION = @ultramonkeyl7_version@
+MODDEV_TEMPDIR = @prefix@/share/doc/${UML7_VERSION}/moduledevel
 
 install:
-       cp ./.libs/libsched_rnd.so ./.libs/sched_rnd.so && \
-       $(INSTALL) -m 755 -d $(L7VS_MODDIR)
-       $(INSTALL) -m 755 -D \
-               ./.libs/sched_rnd.so \
-               $(L7VS_MODDIR)
+       install -c -m 644 -D ./README ${MODDEV_TEMPDIR}/sample/schedule/README
+       install -c -m 644 -D ./Makefile.am.sample ${MODDEV_TEMPDIR}/sample/schedule/Makefile.am
+       install -c -m 644 -D ./configure.in ${MODDEV_TEMPDIR}/sample/schedule/configure.in
+       install -c -m 644 -D ./schedule_module_rnd.cpp ${MODDEV_TEMPDIR}/sample/schedule/schedule_module_rnd.cpp
+       install -c -m 644 -D ./schedule_module_rnd.h ${MODDEV_TEMPDIR}/sample/schedule/schedule_module_rnd.h

diff --git a/doc/moduledevel/sample/schedule/Makefile.am.sample b/doc/moduledevel/sample/schedule/Makefile.am.sample
new file mode 100644 (file)
index 0000000..c799e9c
--- /dev/null
+++ b/doc/moduledevel/sample/schedule/Makefile.am.sample
@@ -0,0 +1,25 @@
+AUTOMAKE_OPTIONS = foreign
+L7VS_MODDIR      = @l7vs_moddir@
+L7VS_INCLUDEDIR  = @l7vs_includedir@
+MAX_BUFFER_SIZE  = @l7vs_max_buffer_size@
+AM_CPPFLAGS = \
+       -g -O2 -fno-strict-aliasing -Wall -Werror -fPIC -pthread \
+       -I$(L7VS_INCLUDEDIR) \
+       -DMAX_BUFFER_SIZE=$(MAX_BUFFER_SIZE)
+
+lib_LTLIBRARIES = \
+       libsched_rnd.la
+
+libsched_rnd_la_SOURCES = \
+       schedule_module_base.h \
+       schedule_module_rnd.h \
+       schedule_module_rnd.cpp
+
+libsched_rnd_la_LIBADD = -lrt -lboost_thread-mt
+
+install:
+       cp ./.libs/libsched_rnd.so ./.libs/sched_rnd.so && \
+       $(INSTALL) -m 755 -d $(L7VS_MODDIR)
+       $(INSTALL) -m 755 -D \
+               ./.libs/sched_rnd.so \
+               $(L7VS_MODDIR)

diff --git a/doc/sslfiles/Makefile.am b/doc/sslfiles/Makefile.am
index f89733e..54c4f88 100644 (file)
--- a/doc/sslfiles/Makefile.am
+++ b/doc/sslfiles/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-L7VS_SSL_CONFDIR = /etc/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 191993f..b15ccd1 100644 (file)
--- a/l7directord/Makefile.am
+++ b/l7directord/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 SBINDIR = @sbindir@
-RCDIR   = /etc/init.d
+RCDIR   = @sysconfdir@/init.d
 
 install:
        $(INSTALL) -m 755 -D ./l7directord $(SBINDIR)/l7directord

diff --git a/l7vsd/Makefile.am b/l7vsd/Makefile.am
index 1bf29c0..cad32f7 100644 (file)
--- a/l7vsd/Makefile.am
+++ b/l7vsd/Makefile.am
@@ -1,2 +1,2 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = init.d src module
+SUBDIRS = init.d src module include

diff --git a/l7vsd/include/Makefile.am b/l7vsd/include/Makefile.am
new file mode 100644 (file)
index 0000000..d2bb9e9
--- /dev/null
+++ b/l7vsd/include/Makefile.am
@@ -0,0 +1,19 @@
+AUTOMAKE_OPTIONS = foreign
+
+L7VS_INCLUDEDIR = @l7vs_includedir@
+
+install:
+       install -c -m 644 -D ./protocol_module_base.h ${L7VS_INCLUDEDIR}/protocol_module_base.h
+       install -c -m 644 -D ./schedule_module_base.h ${L7VS_INCLUDEDIR}/schedule_module_base.h
+       install -c -m 644 -D ./module_base.h ${L7VS_INCLUDEDIR}/module_base.h
+       install -c -m 644 -D ./utility.h ${L7VS_INCLUDEDIR}/utility.h
+       install -c -m 644 -D ./logger.h ${L7VS_INCLUDEDIR}/logger.h
+       install -c -m 644 -D ./logger_enum.h ${L7VS_INCLUDEDIR}/logger_enum.h
+       install -c -m 644 -D ./trapmessage.h ${L7VS_INCLUDEDIR}/trapmessage.h
+       install -c -m 644 -D ./error_code.h ${L7VS_INCLUDEDIR}/error_code.h
+       install -c -m 644 -D ./atomic.h ${L7VS_INCLUDEDIR}/atomic.h
+       install -c -m 644 -D ./wrlock.h ${L7VS_INCLUDEDIR}/wrlock.h
+       install -c -m 644 -D ./replication.h ${L7VS_INCLUDEDIR}/replication.h
+       install -c -m 644 -D ./realserver.h ${L7VS_INCLUDEDIR}/realserver.h
+       install -c -m 644 -D ./realserver_element.h ${L7VS_INCLUDEDIR}/realserver_element.h
+       install -c -m 644 -D ./endpoint.h ${L7VS_INCLUDEDIR}/endpoint.h

diff --git a/l7vsd/init.d/Makefile.am b/l7vsd/init.d/Makefile.am
index 530f810..953a508 100644 (file)
--- 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 /etc/init.d/l7vsd
+       $(INSTALL) -m 755 -D ./l7vsd @sysconfdir@/init.d/l7vsd

diff --git a/ultramonkeyl7.spec b/ultramonkeyl7.spec
index 0aa772c..3ae2fdf 100644 (file)
--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -2,7 +2,7 @@
 %define l7vs_logdir    %{_localstatedir}/log/l7vs
 %define l7vs_includedir %{_includedir}/l7vs
 %define l7vsadm_sockdir        %{_localstatedir}/run/l7vs
-%define l7vs_maxvs     64
+%define l7vs_buffer_size 4096
 
 Summary: The Layer-7 Virtual Server
 Name: ultramonkeyl7
@@ -28,9 +28,9 @@ Requires: perl-Net-SSLeay
 Requires: perl-IO-Socket-SSL
 Requires: perl-IO-Socket-INET6
 
-%define hb2_tempdir    /usr/share/doc/%{name}-%{version}-%{release}/heartbeat-ra
-%define mibs_tempdir   /usr/share/doc/%{name}-%{version}-%{release}/mibs
-%define moduledevel_tempdir    /usr/share/doc/%{name}-%{version}-%{release}/moduledevel
+%define hb2_tempdir    /usr/share/doc/%{name}-%{version}/heartbeat-ra
+%define mibs_tempdir   /usr/share/doc/%{name}-%{version}/mibs
+%define moduledevel_tempdir    /usr/share/doc/%{name}-%{version}/moduledevel
 
 %description
 Layer-7 load balancing daemon
@@ -48,7 +48,15 @@ for UltraMonkeyl7's module.
 %setup -q
 
 %build
-%configure
+%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}
+
 make
 
 %install
@@ -64,75 +72,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{l7vs_logdir}
 mkdir -p ${RPM_BUILD_ROOT}%{l7vsadm_sockdir}
 mkdir -p ${RPM_BUILD_ROOT}%{hb2_tempdir}
 mkdir -p ${RPM_BUILD_ROOT}%{mibs_tempdir}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p ${RPM_BUILD_ROOT}%{moduledevel_tempdir}
-mkdir -p ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample
-mkdir -p ${RPM_BUILD_ROOT}%{l7vs_includedir}
-
-# bin
-install -c -m 755 -D l7vsd/src/l7vsd ${RPM_BUILD_ROOT}%{_sbindir}/l7vsd
-install -c -m 755 -D l7vsd/src/l7vsadm ${RPM_BUILD_ROOT}%{_sbindir}/l7vsadm
-install -c -m 755 -D l7directord/l7directord ${RPM_BUILD_ROOT}%{_sbindir}/l7directord
-
-# lib
-install -c -m 755 -D l7vsd/module/protocol/.libs/libprotomod_sslid.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/protomod_sslid.so
-install -c -m 755 -D l7vsd/module/protocol/.libs/libprotomod_ip.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/protomod_ip.so
-install -c -m 755 -D l7vsd/module/protocol/.libs/libprotomod_sessionless.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/protomod_sessionless.so
-install -c -m 755 -D l7vsd/module/schedule/.libs/libsched_lc.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/sched_lc.so
-install -c -m 755 -D l7vsd/module/schedule/.libs/libsched_rr.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/sched_rr.so
-install -c -m 755 -D l7vsd/module/schedule/.libs/libsched_wrr.so ${RPM_BUILD_ROOT}%{l7vs_moddir}/sched_wrr.so
-
-# initscripts
-install -c -m 755 -D l7directord/init.d/l7directord ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/l7directord
-install -c -m 755 -D l7vsd/init.d/l7vsd ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/l7vsd
-
-# config
-install -c -m 644 -D doc/conf/l7vs.cf ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/l7vs.cf
-install -c -m 644 -D doc/conf/l7directord.cf.sample ${RPM_BUILD_ROOT}%{_sysconfdir}/ha.d/conf/l7directord.cf.sample
-install -c -m 644 -D doc/conf/sslproxy.target.cf ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy/sslproxy.target.cf
-install -c -m 644 -D doc/sslfiles/root.pem ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy/root.pem
-install -c -m 644 -D doc/sslfiles/server.pem ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy/server.pem
-install -c -m 644 -D doc/sslfiles/dh512.pem ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy/dh512.pem
-install -c -m 644 -D doc/sslfiles/passwd.txt ${RPM_BUILD_ROOT}%{_sysconfdir}/l7vs/sslproxy/passwd.txt
-
-# heartbeat2 config
-install -c -m 644 -D doc/heartbeat-ra/logd.cf ${RPM_BUILD_ROOT}%{hb2_tempdir}/logd.cf
-install -c -m 644 -D doc/heartbeat-ra/ha.cf ${RPM_BUILD_ROOT}%{hb2_tempdir}/ha.cf
-install -c -m 600 -D doc/heartbeat-ra/authkeys ${RPM_BUILD_ROOT}%{hb2_tempdir}/authkeys
-install -c -m 600 -D doc/heartbeat-ra/cib.xml-sample ${RPM_BUILD_ROOT}%{hb2_tempdir}/cib.xml
-install -c -m 755 -D doc/heartbeat-ra/L7vsd ${RPM_BUILD_ROOT}%{hb2_tempdir}/L7vsd
-install -c -m 755 -D doc/heartbeat-ra/L7directord ${RPM_BUILD_ROOT}%{hb2_tempdir}/L7directord
-install -c -m 755 -D doc/heartbeat-ra/VIPcheck ${RPM_BUILD_ROOT}%{hb2_tempdir}/VIPcheck
-
-# mib file
-install -c -m 644 -D doc/mibs/ULTRAMONKEY-L7-MIB.txt ${RPM_BUILD_ROOT}%{mibs_tempdir}/ULTRAMONKEY-L7-MIB.txt
-
-# header for devel
-install -c -m 644 -D l7vsd/include/protocol_module_base.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/protocol_module_base.h
-install -c -m 644 -D l7vsd/include/schedule_module_base.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/schedule_module_base.h
-install -c -m 644 -D l7vsd/include/module_base.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/module_base.h
-install -c -m 644 -D l7vsd/include/utility.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/utility.h
-install -c -m 644 -D l7vsd/include/logger.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/logger.h
-install -c -m 644 -D l7vsd/include/logger_enum.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/logger_enum.h
-install -c -m 644 -D l7vsd/include/trapmessage.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/trapmessage.h
-install -c -m 644 -D l7vsd/include/error_code.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/error_code.h
-install -c -m 644 -D l7vsd/include/atomic.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/atomic.h
-install -c -m 644 -D l7vsd/include/wrlock.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/wrlock.h
-install -c -m 644 -D l7vsd/include/replication.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/replication.h
-install -c -m 644 -D l7vsd/include/realserver.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/realserver.h
-install -c -m 644 -D l7vsd/include/realserver_element.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/realserver_element.h
-install -c -m 644 -D l7vsd/include/endpoint.h ${RPM_BUILD_ROOT}%{l7vs_includedir}/endpoint.h
-install -c -m 644 -D doc/moduledevel/sample/protocol/README ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/README
-install -c -m 644 -D doc/moduledevel/sample/protocol/Makefile.am ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/Makefile.am
-install -c -m 644 -D doc/moduledevel/sample/protocol/configure.in ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/configure.in
-install -c -m 644 -D doc/moduledevel/sample/protocol/http_protocol_module_base.cpp ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/http_protocol_module_base.cpp
-install -c -m 644 -D doc/moduledevel/sample/protocol/http_protocol_module_base.h ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/http_protocol_module_base.h
-install -c -m 644 -D doc/moduledevel/sample/protocol/protocol_module_simple.cpp ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/protocol_module_simple.cpp
-install -c -m 644 -D doc/moduledevel/sample/protocol/protocol_module_simple.h ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/protocol/protocol_module_simple.h
-install -c -m 644 -D doc/moduledevel/sample/schedule/README ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/schedule/README
-install -c -m 644 -D doc/moduledevel/sample/schedule/Makefile.am ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/schedule/Makefile.am
-install -c -m 644 -D doc/moduledevel/sample/schedule/configure.in ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/schedule/configure.in
-install -c -m 644 -D doc/moduledevel/sample/schedule/schedule_module_rnd.cpp ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/schedule/schedule_module_rnd.cpp
-install -c -m 644 -D doc/moduledevel/sample/schedule/schedule_module_rnd.h ${RPM_BUILD_ROOT}%{moduledevel_tempdir}/sample/schedule/schedule_module_rnd.h
+mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
+
+make install 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,18 +97,21 @@ fi
 %defattr(-, root, root, 0755)
 %{_sbindir}/*
 %{l7vs_moddir}/*
-%{_sysconfdir}/rc.d/init.d/*
+%{_sysconfdir}/init.d/*
 %dir %{l7vs_moddir}
 %dir %{l7vs_logdir}
-%config(noreplace) %{_sysconfdir}/l7vs/*
-%config(noreplace) %{_sysconfdir}/ha.d/*
 %dir %{_sysconfdir}/l7vs
 %dir %{_sysconfdir}/ha.d
+%config(noreplace) %{_sysconfdir}/l7vs/*
+%config(noreplace) %{_sysconfdir}/ha.d/*
 %dir %{l7vsadm_sockdir}
+%dir %{_docdir}/%{name}-%{version}
 %dir %{hb2_tempdir}
-%config(noreplace) %{hb2_tempdir}/*
+%doc %{hb2_tempdir}/*
 %dir %{mibs_tempdir}
-%config(noreplace) %{mibs_tempdir}/*
+%doc %{mibs_tempdir}/*
+%{_mandir}/man8/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/l7directord
 
 %files devel
 %defattr(-, root, root, 0755)