[72721] trunk/dports/devel/qscintilla/Portfile

[michaelld at macports.org]

Revision: 72721
          http://trac.macports.org/changeset/72721
Author:   michaelld at macports.org
Date:     2010-10-24 19:00:51 -0700 (Sun, 24 Oct 2010)
Log Message:
-----------
Make sure the Qsci Qt designer plugin uses the just-created Qsci
library and its headers, by moving their -L and -I paths to the front
of the compile directive.

Modified Paths:
--------------
    trunk/dports/devel/qscintilla/Portfile

Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile	2010-10-25 01:35:18 UTC (rev 72720)
+++ trunk/dports/devel/qscintilla/Portfile	2010-10-25 02:00:51 UTC (rev 72721)
@@ -55,7 +55,17 @@
                      cd ${worksrcpath}/designer-Qt4; ${qt_qmake_cmd} designer.pro; \
                      echo"
 
-build.env-append    CPLUS_INCLUDE_PATH=${worksrcpath}/Qt4 LIBRARY_PATH=${worksrcpath}/Qt4
+post-configure {
+    # make sure the designer plugin finds the correct Qsci library, by
+    # putting its search path first of all -L paths
+    reinplace "/LIBS/s@\-L/opt/local/lib@\-L../Qt4 at 1" \
+        ${worksrcpath}/designer-Qt4/Makefile
+    # make sure the designer plugin finds the correct Qsci includes, by
+    # putting its search path first of all -I paths
+    reinplace "/INCPATH/s@\-I@\-I../Qt4 \-I at 1" \
+        ${worksrcpath}/designer-Qt4/Makefile
+}
+
 build.cmd           "cd ${worksrcpath}/Qt4; make; cd ${worksrcpath}/designer-Qt4; make; echo"
 
 destroot.cmd        "cd ${worksrcpath}/Qt4; make install; cd ${worksrcpath}/designer-Qt4; make install; echo"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101024/57dd56a1/attachment.html>