[78178] trunk/base/src/package1.0/portpkg.tcl

[jmr at macports.org]

Revision: 78178
          http://trac.macports.org/changeset/78178
Author:   jmr at macports.org
Date:     2011-04-27 08:51:39 -0700 (Wed, 27 Apr 2011)
Log Message:
-----------
add --no-relocate to packagemaker args on 10.6+ so IFPkgPathMappings aren't added (#25174)

Modified Paths:
--------------
    trunk/base/src/package1.0/portpkg.tcl

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2011-04-27 15:45:38 UTC (rev 78177)
+++ trunk/base/src/package1.0/portpkg.tcl	2011-04-27 15:51:39 UTC (rev 78178)
@@ -115,7 +115,12 @@
                 set infofile "${workpath}/Info.plist"
                 write_info_plist ${workpath}/Info.plist $portname $portversion $portrevision
             }
-            system "PMResourceLocale=${language} $packagemaker -AppleLanguages \"(${language})\" --root ${destpath} --out ${pkgpath} ${pkgresources} --info $infofile --target $pkgtarget --domain system --id org.macports.$portname"
+            set cmdline "PMResourceLocale=${language} $packagemaker -AppleLanguages \"(${language})\" --root ${destpath} --out ${pkgpath} ${pkgresources} --info $infofile --target $pkgtarget --domain system --id org.macports.$portname"
+            if {${os.major} >= 10} {
+                append cmdline " --no-relocate"
+            }
+            ui_debug "Running command line: $cmdline"
+            system $cmdline
         } else {
             write_info_plist ${workpath}/Info.plist $portname $portversion $portrevision
             write_description_plist ${workpath}/Description.plist $portname $portversion $description
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110427/8a24143a/attachment.html>