summarylogtreecommitdiffstats
path: root/config.patch
blob: 0c9dad699aa9819d8cd5a487f945a329dc42a16a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
--- config.mak	2014-05-07 00:28:31.000000000 -0700
+++ ../../../ipe-7.1.5/src/config.mak	2014-05-07 07:08:11.675366079 -0700
@@ -31,7 +31,7 @@
 #
 # The name of the Lua package (it could be "lua", "lua52", or "lua5.2")
 #
-LUA_PACKAGE   ?= lua5.2
+LUA_PACKAGE   ?= lua
 #
 ZLIB_CFLAGS   ?=
 ZLIB_LIBS     ?= -lz
@@ -57,7 +57,7 @@
 # If you have different Qt versions installed, you may have to change
 # this to "moc-qt4" if the default is Qt3's "moc".
 #
-MOC	      ?= moc
+MOC	      ?= moc-qt4
 #
 else
 #
@@ -76,13 +76,13 @@
 	 -I/usr/X11/include/libpng12
 CAIRO_LIBS ?= -L/usr/X11/lib -lcairo
 LUA_CFLAGS ?= -I/usr/local/include
-LUA_LIBS   ?= -L/usr/local/lib -llua52 -lm
+LUA_LIBS   ?= -L/usr/local/lib -llua -lm
 QT_CFLAGS  ?= -I/Library/Frameworks/QtCore.framework/Versions/4/Headers \
 	      -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
 QT_LIBS    ?= -F/Library/Frameworks -L/Library/Frameworks \
 	      -framework QtCore -framework ApplicationServices \
 	      -framework QtGui -framework AppKit -framework Cocoa -lz -lm
-MOC	   ?= moc
+MOC	   ?= moc-qt4
 endif
 #
 # --------------------------------------------------------------------