Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18176/10.7/stable/main/finkinfo/editors
Modified Files:
lyx2.info
Log Message:
We're already linking X11 for all variants, so might as well put it in
the include flags for all.
Index: lyx2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/lyx2.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- lyx2.info 27 Jan 2013 22:34:36 -0000 1.11
+++ lyx2.info 27 Jan 2013 23:10:48 -0000 1.12
@@ -34,6 +34,7 @@
GCC: 4.0
UpdatePoMakefile: true
+SetCPPFLAGS: -I/usr/X11/include
SetLDFLAGS: -Wl,-framework,AppKit -Wl,-framework,Carbon -Wl,-framework,OpenGL
-Wl,-framework,AGL -L/usr/X11/lib -lX11
PatchFile: lyx.patch
@@ -54,8 +55,8 @@
(%type_pkg[-ui] = -mac) --prefix='%i/Applications/LyX.app' \
(%type_pkg[-ui] = -x11) --mandir='${prefix}/share/man' \
--with-frontend=qt4 \
---with-qt4-includes=%p/lib/qt4%type_pkg[-ui]/include \
---with-qt4-libraries=%p/lib/qt4%type_pkg[-ui]/lib \
+--with-qt4-includes=%p/lib/qt4-mine%type_pkg[-ui]/include \
+--with-qt4-libraries=%p/lib/qt4-mine%type_pkg[-ui]/lib \
(%type_pkg[-ui] = -mac) --without-x \
(%type_pkg[-ui] = -x11) --with-packaging=posix \
(%type_pkg[-ui] = -mac) --with-packaging=macosx \
@@ -67,12 +68,9 @@
<<
CompileScript: <<
#!/bin/sh -ev
- if [ "%type_pkg[-ui]" = "-x11" ]
- then export CPPFLAGS="$CPPFLAGS -I/usr/X11/include"
- fi
export PYTHON=/usr/bin/python
export CCACHE_DISABLE=1
- export QT4DIR=%p/lib/qt4%type_pkg[-ui]
+ export QT4DIR=%p/lib/qt4-mine%type_pkg[-ui]
%{default_script}
fink-package-precedence .
<<
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
