Permalink
Browse files

use docdir macro; install docs in tsung-%version% for rpm

  • Loading branch information...
1 parent 777b89d commit 4482037964700c4e4db980ef9d0c77cc320290c3 @nniclausse nniclausse committed Jun 21, 2011
Showing with 8 additions and 5 deletions.
  1. +5 −2 Makefile.in
  2. +3 −3 tsung.spec.in
View
@@ -19,12 +19,15 @@ ERLANG_XMERL_DIR=@ERLANG_LIB_DIR_xmerl@/include
raw_erlang_prefix=@libdir@/erlang/
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
+
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
datadir=@datadir@
datarootdir=@datarootdir@
+docdir=@docdir@
TEMPLATES_SUBDIR=@TEMPLATES_SUBDIR@
CONFIGURE_DEPENDENCIES=@CONFIGURE_DEPENDENCIES@
@@ -72,11 +75,11 @@ endif
BINDIR = $(bindir)
LIBDIR = $(libdir)/tsung/
TOOLS_BINDIR = $(LIBDIR)/bin
-CONFDIR = $(datadir)/doc/tsung/examples
+CONFDIR = $(docdir)/examples
SHARE_DIR = $(datadir)/tsung/
TEMPLATES_DIR = $(datadir)/$(TEMPLATES_SUBDIR)
MAN_DIR = $(datadir)/man/man1/
-DOC_DIR = $(datadir)/doc/tsung
+DOC_DIR = $(docdir)
# custom behaviours
BEHAVIORS = ebin/ts_plugin.beam
View
@@ -38,22 +38,22 @@ More information is available at http://tsung.erlang-projects.org/ .
%setup -q
%build
-%configure
+%configure --docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -p -m 644 CHANGES CONTRIBUTORS COPYING README TODO \
- $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
+ $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/tsung/*
+%doc %{_datadir}/doc/%{name}-%{version}/*
%{_bindir}/tsung
%{_bindir}/tsung-recorder
%{_bindir}/tsplot

0 comments on commit 4482037

Please sign in to comment.