1 diff -Naur WordNet-1.7.1/src/lib/Makefile WordNet-1.7.1-p/src/lib/Makefile
2 --- WordNet-1.7.1/src/lib/Makefile Thu Mar 7 21:03:55 2002
3 +++ WordNet-1.7.1-p/src/lib/Makefile Thu Oct 30 12:01:14 2003
7 LOCAL_CFLAGS = -O -DUNIX
8 -CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS)
9 +CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS) -I../include
13 diff -Naur WordNet-1.7.1/src/wn/Makefile WordNet-1.7.1-p/src/wn/Makefile
14 --- WordNet-1.7.1/src/wn/Makefile Thu Mar 7 21:05:45 2002
15 +++ WordNet-1.7.1-p/src/wn/Makefile Thu Oct 30 12:07:17 2003
19 LOCAL_CFLAGS = -O -DUNIX
20 -CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS)
21 +CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS) -I../include
22 LOCAL_LDFLAGS = -static
23 -LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS)
24 +LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS) -L../lib
28 diff -Naur WordNet-1.7.1/src/wnb/Makefile WordNet-1.7.1-p/src/wnb/Makefile
29 --- WordNet-1.7.1/src/wnb/Makefile Thu Mar 7 21:06:51 2002
30 +++ WordNet-1.7.1-p/src/wnb/Makefile Thu Oct 30 12:44:19 2003
34 LOCAL_CFLAGS = -O -DUNIX -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR)
35 -CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS)
36 +CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS) -I../include
37 LOCAL_LDFLAGS = -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR)
38 -LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS)
39 +LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS) -L../lib
40 LIBS = -lwn $(WNB_LIBS)
43 diff -Naur WordNet-1.7.1/src/wnb/Makefile WordNet-1.7.1-p/src/wnb/Makefile
44 --- WordNet-1.7.1/src/wnb/Makefile Thu Oct 30 12:57:25 2003
45 +++ WordNet-1.7.1-p/src/wnb/Makefile Thu Oct 30 12:58:05 2003
47 TCL_LIBDIR = /usr/local/lib
48 TK_INCDIR = /usr/local/include
49 TK_LIBDIR = /usr/local/lib
50 -X11_INCDIR = /usr/X11/include
51 -X11_LIBDIR = /usr/X11/lib
52 +X11_INCDIR = /usr/X11R6/include
53 +X11_LIBDIR = /usr/X11R6/lib
55 # The Solaris version of WordNet was built with Tcl/Tk 8.3
57 diff -Naur WordNet-1.7.1/src/wnb/Makefile WordNet-1.7.1-p/src/wnb/Makefile
58 --- WordNet-1.7.1/src/wnb/Makefile Thu Oct 30 13:00:05 2003
59 +++ WordNet-1.7.1-p/src/wnb/Makefile Thu Oct 30 13:00:28 2003
61 @echo "Done uninstalling WordNet browser interface from $(WN_INSTALLDIR)"
64 - $(CC) -o wishwn $(LDFLAGS) $(OBJ) $(LIBS)
65 + $(CC) -o wishwn $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS)
69 diff -Naur WordNet-1.7.1/src/wnb/Makefile WordNet-1.7.1-p/src/wnb/Makefile
70 --- WordNet-1.7.1/src/wnb/Makefile Thu Oct 30 13:02:26 2003
71 +++ WordNet-1.7.1-p/src/wnb/Makefile Thu Oct 30 13:02:13 2003
74 LOCAL_CFLAGS = -O -DUNIX -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR)
75 CFLAGS = -I$(WN_INCDIR) $(LOCAL_CFLAGS) -I../include
76 -LOCAL_LDFLAGS = -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR)
77 -LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS) -L../lib
79 +LDFLAGS= -L$(WN_LIBDIR) $(LOCAL_LDFLAGS) -L../lib -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR)
80 LIBS = -lwn $(WNB_LIBS)
83 diff -Naur WordNet-1.7.1/src/wnb/Makefile WordNet-1.7.1-p/src/wnb/Makefile
84 --- WordNet-1.7.1/src/wnb/Makefile Thu Oct 30 13:05:37 2003
85 +++ WordNet-1.7.1-p/src/wnb/Makefile Thu Oct 30 13:06:30 2003
88 # The Solaris version of WordNet was built with Tcl/Tk 8.3
90 -WNB_LIBS = -ltk8.3 -ltcl8.3 -lX11 -lm -lsocket -lnsl -ldl -lpthread
91 +WNB_LIBS = -ltk8.3 -ltcl8.3 -lX11 -lm -ldl -lpthread
94 LOCAL_CFLAGS = -O -DUNIX -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR)