From 86d39bea42362c5825c7b521e6781305623ec656 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 29 May 2012 17:10:10 -0700 Subject: [PATCH] ibacm: Fix rmpbuild issues Signed-off-by: Sean Hefty --- Makefile.am | 3 ++- ibacm.spec.in | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index de035bc..ca8a939 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,5 +25,6 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init.in \ install-exec-hook: install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm; -dist-hook: ibacm.spec +dist-hook: ibacm.spec ibacm.init cp ibacm.spec $(distdir) + cp ibacm.init $(distdir) diff --git a/ibacm.spec.in b/ibacm.spec.in index 771338e..0c12aa1 100644 --- a/ibacm.spec.in +++ b/ibacm.spec.in @@ -7,7 +7,6 @@ Group: System Environment/Daemons License: GPLv2 or BSD Url: http://www.openfabrics.org/ Source0: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz -Source1: ibacm.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel @@ -52,8 +51,8 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=%{buildroot} install -install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} +make install DESTDIR=$RPM_BUILD_ROOT +install -D -m 755 ibacm.init $RPM_BUILD_ROOT{_sysconfdir}/init.d/%{name} %makeinstall %clean @@ -75,8 +74,7 @@ fi %{_sbindir}/ibacm %{_mandir}/man1/* %{_mandir}/man7/* -%config(noreplace) %{_sysconfdir}/rdma/* -%{_initrddir}/ibacm +%{_sysconfdir}/init.d/ibacm %files devel %defattr(-,root,root,-) -- 2.46.0