From 6ee76fab7bb9d236317fe5436d29999b402e8384 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 12 May 2011 11:29:15 -0400 Subject: [PATCH] ThirdParty: correction of spec files for installation of qt and scotch --- ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec | 4 +++- ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec index 8f1cc8069..e1d2a199c 100644 --- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec +++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec @@ -108,7 +108,9 @@ Group: Development/Tools make -j $WM_NCOMPPROCS %install - make install DESTDIR=$RPM_BUILD_ROOT + # Makefiles generated by qmake do not to support the DESTDIR= option + # We need to use the INSTALL_ROOT= option instead + make install INSTALL_ROOT=$RPM_BUILD_ROOT # Creation of OpenFOAM specific .csh and .sh files" diff --git a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec index 5d2455818..9b4fd18d4 100644 --- a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec +++ b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec @@ -109,7 +109,7 @@ Patch0: scotch-5.1.10b_patch_0 %install cd src mkdir -p $RPM_BUILD_ROOT%{_installPrefix} - make install DESTDIR=$RPM_BUILD_ROOT + make install prefix=$RPM_BUILD_ROOT%{_installPrefix} # Creation of OpenFOAM specific .csh and .sh files" -- 2.11.4.GIT