blob: 32102bedf2c5ae1e29a9a1359059edae9a8f049a (
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
|
diff -urN mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile
--- mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200
+++ mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:39:01.000000000 +1200
@@ -8,10 +8,7 @@
# You may need to modify the line below
-MLLIBS = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \
- -lXt -lICE -lSM
-
-MLFLAGS = -R/usr/X11R6/lib
+MLLIBS = -ltk -ltcl
# On some Linux machines you may need to let mgnuc know where the
# tcl/tk header files are.
diff -urN mercury-extras-10.04.1.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m
--- mercury-extras-10.04.1.orig/graphics/mercury_tcltk/mtcltk.m 2007-08-21 14:47:37.000000000 +1200
+++ mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m 2010-09-06 19:39:01.000000000 +1200
@@ -154,7 +154,7 @@
MR_incr_hp(argv_word, argc + 1);
argv = (char **) argv_word;
- for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
+ for (i = 0, l = Args; l != MR_list_empty(); l = MR_list_tail(l), i++) {
argv[i] = (char *) MR_list_head(l);
}
|