Try again, and now make sure that the spec file explicitly references the
cmake-generated Makefile rather than the default GNUMakefile.
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
GNUmakefile | 5 ++++-
matahari.spec.in | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index d27cc58..22d6af1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,6 +51,9 @@ tests: linux.build
cd linux.build/src/unittests && ctest -V; \
fi
+install: linux.build
+ $(MAKE) --no-print-dir -C $< install
+
windows.build:
@echo "=::=::=::= Setting up for Windows =::=::=::= "
mkdir -p $@
@@ -182,4 +185,4 @@ endif
@sed -i -e 's/###MATAHARI_VERSION###/$(VERSION)/' doc/Doxyfile
@doxygen doc/Doxyfile
-.PHONY: check linux.build windows.build clean doxygen tags www-doxygen coverity
$(VARIANT)$(PACKAGE).spec
+.PHONY: check linux.build windows.build install clean doxygen tags www-doxygen coverity
$(VARIANT)$(PACKAGE).spec
diff --git a/matahari.spec.in b/matahari.spec.in
index 8f105f4..3bfd509 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -242,14 +242,14 @@ QMF console for monitoring various agents
%build
%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF}
%{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} .
-make %{?_smp_mflags}
+make -f Makefile %{?_smp_mflags}
%if %{defined run_unit_tests}
cd src/tests && ctest -V
%endif
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} -f Makefile install
%if %{systemd}
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-service
Show replies by date