From b47cffa9b892b3f4bd3d99efb4e3130440af8300 Mon Sep 17 00:00:00 2001 From: David Cole Date: Fri, 20 Jul 2012 11:43:41 -0400 Subject: CPack: Use bin subdir when looking for dpkg and rpmbuild --- Source/CPack/cmCPackDebGenerator.h | 4 ++-- Source/CPack/cmCPackRPMGenerator.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index 84b0023..d678cfa 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -36,8 +36,8 @@ public: #ifdef __APPLE__ // on MacOS enable CPackDeb iff dpkg is found std::vector locations; - locations.push_back("/sw"); // Fink - locations.push_back("/opt/local"); //MacPort + locations.push_back("/sw/bin"); // Fink + locations.push_back("/opt/local/bin"); // MacPorts return cmSystemTools::FindProgram("dpkg",locations) != "" ? true : false; #else // legacy behavior on other systems diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index c7dace4..a7722bc 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -40,8 +40,8 @@ public: #ifdef __APPLE__ // on MacOS enable CPackRPM iff rpmbuild is found std::vector locations; - locations.push_back("/sw"); // Fink - locations.push_back("/opt/local"); //MacPort + locations.push_back("/sw/bin"); // Fink + locations.push_back("/opt/local/bin"); // MacPorts return cmSystemTools::FindProgram("rpmbuild") != "" ? true : false; #else // legacy behavior on other systems -- cgit v0.12