Browse Source

CPack: Use bin subdir when looking for dpkg and rpmbuild

David Cole 13 years ago
parent
commit
b47cffa9b8
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Source/CPack/cmCPackDebGenerator.h
  2. 2 2
      Source/CPack/cmCPackRPMGenerator.h

+ 2 - 2
Source/CPack/cmCPackDebGenerator.h

@@ -36,8 +36,8 @@ public:
 #ifdef __APPLE__
     // on MacOS enable CPackDeb iff dpkg is found
     std::vector<std::string> 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

+ 2 - 2
Source/CPack/cmCPackRPMGenerator.h

@@ -40,8 +40,8 @@ public:
 #ifdef __APPLE__
     // on MacOS enable CPackRPM iff rpmbuild is found
     std::vector<std::string> 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