Merge pull request #2359 from wlemkows/stable-1.3

common: fix build with NORPATH
pmem · Nov 16, 2017 · 4521370 · 4521370
2 parents 4a7e933 + bcfefa9
commit 4521370
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/utils/build-rpm.sh b/utils/build-rpm.sh
@@ -449,7 +449,7 @@ if [ -f $TEST_CONFIG_FILE ]; then
 else
 	cp src/test/testconfig.sh.example src/test/testconfig.sh
 fi
-%{__make}
+%{__make} NORPATH=1
 
 %install
 rm -rf %{buildroot}
@@ -462,8 +462,8 @@ make install DESTDIR=%{buildroot}\
 	sysconfdir=%{_sysconfdir}\
 	docdir=%{_docdir}\
 	EXPERIMENTAL=${EXPERIMENTAL}\
-	CPP_DOC_DIR=${OBJ_CPP_DOC_DIR}\
-	NORPATH=1
+	CPP_DOC_DIR=${OBJ_CPP_DOC_DIR}
+
 mkdir -p %{buildroot}%{_datadir}/nvml
 cp utils/nvml.magic %{buildroot}%{_datadir}/nvml/