File link-grammar-4.5.5-fridrich.patch of Package mingw32-link-grammar

Overview Repositories Revisions Requests Users Attributes Meta

File link-grammar-4.5.5-fridrich.patch of Package mingw32-link-grammar (Revision 7e68b195608fcf2c31fd2715a40d2921)

Currently displaying revision 7e68b195608fcf2c31fd2715a40d2921 , Show latest

Index: link-grammar/jni-client.c
===================================================================
--- link-grammar/jni-client.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/jni-client.c	(.../trunk)	(revision 26504)
@@ -180,7 +180,7 @@
 	int i;
 	CNode* c;
 
-	if (cn==NULL) return;
+	if (cn == NULL) return;
 
 	/* print label */
 	if (cn->label != NULL) {
@@ -423,6 +423,7 @@
 
 	/* FWIW, j will be null if w is utf8-encoded Japanese or Chinese.
 	 * I guess my JVM is not capable of handling Chinese/Japanese ??
+	 * Maybe some special java thing needs to be installed?
 	 */
 	jstring j = (*env)->NewStringUTF(env, w);
 	return j;
@@ -443,15 +444,66 @@
 JNIEXPORT jstring JNICALL
 Java_org_linkgrammar_LinkGrammar_getLinkageDisjunct(JNIEnv *env, jclass cls, jint i)
 {
+	jstring j;
 	per_thread_data *ptd = get_ptd(env, cls);
 
 	/* does not need to be freed, points into data structures */
 	/* returns the inflected word. */
 	const char * w = linkage_get_disjunct(ptd->linkage, i);
-	jstring j = (*env)->NewStringUTF(env, w);
+	if (NULL == w) j = NULL;
+	else j = (*env)->NewStringUTF(env, w);
 	return j;
 }
 
+JNIEXPORT jstring JNICALL
+Java_org_linkgrammar_LinkGrammar_getLinkageSense(JNIEnv *env, 
+                    jclass cls, jint i, jint j)
+{
+	per_thread_data *ptd = get_ptd(env, cls);
+	Linkage lkg = ptd->linkage;
+	Linkage_info *lifo = lkg->info;
+	Sense *sns;
+	const char * w = NULL;
+	jstring js;
+
+	lg_corpus_linkage_senses(lkg);
+	sns = lg_get_word_sense(lifo, i);
+	while ((0 < j) && sns)
+	{
+		sns = lg_sense_next(sns);
+		j--;
+	}
+	
+	/* does not need to be freed, points into data structures */
+	if (sns) w = lg_sense_get_sense(sns);
+
+	if (w) js = (*env)->NewStringUTF(env, w);
+	else js = NULL;
+	return js;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_org_linkgrammar_LinkGrammar_getLinkageSenseScore(JNIEnv *env, 
+                    jclass cls, jint i, jint j)
+{
+	per_thread_data *ptd = get_ptd(env, cls);
+	Linkage lkg = ptd->linkage;
+	Linkage_info *lifo = lkg->info;
+	Sense *sns;
+	double score = 0.0;
+
+	sns = lg_get_word_sense(lifo, i);
+	while ((0 < j) && sns)
+	{
+		sns = lg_sense_next(sns);
+		j--;
+	}
+	
+	if (sns) score = lg_sense_get_score(sns);
+
+	return score;
+}
+
 /*
  * Class:		 LinkGrammar
  * Method:		numSkippedWords
Index: link-grammar/jni-client.h
===================================================================
--- link-grammar/jni-client.h	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/jni-client.h	(.../trunk)	(revision 26504)
@@ -80,6 +80,12 @@
 JNIEXPORT jstring JNICALL Java_org_linkgrammar_LinkGrammar_getLinkageDisjunct
 	(JNIEnv *, jclass, jint);
 
+JNIEXPORT jstring JNICALL Java_org_linkgrammar_LinkGrammar_getLinkageSense
+   (JNIEnv *, jclass, jint, jint);
+
+JNIEXPORT jdouble JNICALL Java_org_linkgrammar_LinkGrammar_getLinkageSenseScore
+   (JNIEnv *, jclass, jint, jint);
+
 JNIEXPORT jstring JNICALL
 Java_org_linkgrammar_LinkGrammar_getVersion(JNIEnv *, jclass);
 
Index: link-grammar/read-dict.c
===================================================================
--- link-grammar/read-dict.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/read-dict.c	(.../trunk)	(revision 26504)
@@ -1318,7 +1318,9 @@
 		}
 
 		/* if it's a word-file name */
-		if (dict->token[0] == '/')
+		/* However, be careful to reject "/.v" which is the division symbol
+		 * used in equations (.v means verb-like) */
+		if ((dict->token[0] == '/') && (dict->token[1] != '.'))
 		{
 			dn = read_word_file(dict, dn, dict->token);
 			if (dn == NULL)
Index: link-grammar/disjuncts.c
===================================================================
--- link-grammar/disjuncts.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/disjuncts.c	(.../trunk)	(revision 26504)
@@ -44,6 +44,11 @@
 	int nlinks = pi->N_links;
 	int *djlist, *djloco, *djcount;
 
+	if (lifo->disjunct_list_str) return;
+	lifo->nwords = nwords;
+	lifo->disjunct_list_str = (char **) malloc(nwords * sizeof(char *));
+	bzero(lifo->disjunct_list_str, nwords * sizeof(char *));
+
 	djcount = (int *) malloc (sizeof(int) * (nwords + 2*nwords*nlinks));
 	djlist = djcount + nwords;
 	djloco = djlist + nwords*nlinks;
Index: link-grammar/api.c
===================================================================
--- link-grammar/api.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/api.c	(.../trunk)	(revision 26504)
@@ -747,20 +747,22 @@
 
 static void linkage_info_delete(Linkage_info *link_info, int sz)
 {
-#ifdef USE_CORPUS
 	int i,j;
 
 	for (i=0; i<sz; i++)
 	{
 		Linkage_info *lifo = &link_info[i];
-		for (j=0; j<MAX_SENTENCE; j++)
+		int nwords = lifo->nwords;
+		for (j=0; j<nwords; j++)
 		{
 			if (lifo->disjunct_list_str[j])
 				free(lifo->disjunct_list_str[j]);
-			lifo->disjunct_list_str[j] = NULL;
 		}
+		free(lifo->disjunct_list_str);
+#ifdef USE_CORPUS
+		lg_sense_delete(lifo);
+#endif
 	}
-#endif
 	xfree(link_info, sz);
 }
 
@@ -1330,7 +1332,7 @@
 
 static PP_info excopy_pp_info(PP_info ppi)
 {
-	static PP_info newppi;
+	PP_info newppi;
 	int i;
 
 	newppi.num_domains = ppi.num_domains;
@@ -1528,7 +1530,7 @@
 
 const char * linkage_get_disjunct(Linkage linkage, int w)
 {
-	if (NULL == linkage->info->disjunct_list_str[w])
+	if (NULL == linkage->info->disjunct_list_str)
 	{
 		lg_compute_disjunct_strings(linkage->sent, linkage->info);
 	}
Index: link-grammar/pp_lexer.c
===================================================================
--- link-grammar/pp_lexer.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/pp_lexer.c	(.../trunk)	(revision 26504)
@@ -32,7 +32,7 @@
    the code.
 
      Got rid of #line directives.
-     Added the prototype of yywrpa() right below this comment.
+     Added the prototype of yywrap() right below this comment.
      Commented out code and prototype declarations for the unused functions
  */
 
Index: link-grammar/api-types.h
===================================================================
--- link-grammar/api-types.h	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/api-types.h	(.../trunk)	(revision 26504)
@@ -60,5 +60,8 @@
 
 typedef struct pp_knowledge_s pp_knowledge;
 
+typedef struct corpus_s Corpus;
+typedef struct sense_s Sense;
+
 #endif
 
Index: link-grammar/utilities.h
===================================================================
--- link-grammar/utilities.h	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/utilities.h	(.../trunk)	(revision 26504)
@@ -41,13 +41,17 @@
 /* The Microsoft Visual C compiler doesn't support the "inline" keyword. */
 #define inline
 
-/* Non-standard string functions */
+/* MS Visual C uses non-standard string function names */
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 #define strcasecmp _stricmp
 #define strncasecmp(a,b,s) strnicmp((a),(b),(s))
 
-/* Strangely, though, no langinfo Windows */
+#endif /* _MSC_VER */
+
+/* Appearntly, MinGW is also missing a variety of standard fuctions */
+#if defined(_MSC_VER) || defined(__MINGW32__)
+/* No langinfo Windows */
 #define nl_langinfo(X) ""
 
 /* strtok_r is missing in Windows */
@@ -57,9 +61,10 @@
 #define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
 
 /* Windows doesn't have a thread-safe rand (???) */
+/* Surely not, there must be something */
 /* XXX FIXME -- this breaks thread safety on windows */
 #define rand_r(seedp) rand()
-#endif
+#endif /* _MSC_VER || __MINGW32__ */
 
 /* CYGWIN on Windows doesn't have UTF8 support, or wide chars ... 
  * However, MS Visual C appearently does ... 
@@ -77,7 +82,7 @@
 #define WEOF      EOF
 #define towlower  tolower
 #define towupper  toupper
-#endif
+#endif /* __CYGWIN__ */
 
 #endif /* _WIN32 */
 
Index: link-grammar/count.c
===================================================================
--- link-grammar/count.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/count.c	(.../trunk)	(revision 26504)
@@ -15,6 +15,16 @@
 
 /* This file contains the exhaustive search algorithm. */
 
+typedef struct Table_connector_s Table_connector;
+struct Table_connector_s
+{
+	short            lw, rw;
+	Connector        *le, *re;
+	short            cost;
+	s64              count;
+	Table_connector  *next;
+};
+
 struct count_context_s
 {
 	char ** deletable;
@@ -23,6 +33,8 @@
 	int     null_block;
 	int     islands_ok;
 	int     null_links;
+	int     table_size;
+	Table_connector ** table;
 	Resources current_resources;
 };
 
@@ -143,40 +155,42 @@
 		return FALSE;
 }
 
-typedef struct Table_connector_s Table_connector;
-struct Table_connector_s
+void init_table(Sentence sent)
 {
-	short            lw, rw;
-	Connector        *le, *re;
-	short            cost;
-	s64              count;
-	Table_connector  *next;
-};
+	/* A piecewise exponential function determines the size of the
+	 * hash table. Probably should make use of the actual number of
+	 * disjuncts, rather than just the number of words.
+	 */
+	int i;
+	count_context_t *ctxt = sent->count_ctxt;
 
-static int table_size;
-static Table_connector ** table;
-
-void init_table(Sentence sent) {
-	/* A piecewise exponential function determines the size of the hash table.	  */
-	/* Probably should make use of the actual number of disjuncts, rather than just */
-	/* the number of words														  */
-	int i;
-	if (sent->length >= 10) {
-		table_size = (1<<16);
-		/*  } else if (sent->length >= 10) {
-			table_size = (1 << (((6*(sent->length-10))/30) + 10)); */
-	} else if (sent->length >= 4) {
-		table_size = (1 << (((6*(sent->length-4))/6) + 4));
-	} else {
-		table_size = (1 << 4);
+	if (sent->length >= 10)
+	{
+		ctxt->table_size = (1<<16);
+#if 0
+		} else if (sent->length >= 10) {
+			table_size = (1 << (((6*(sent->length-10))/30) + 10)); 
+#endif
+	} 
+	else if (sent->length >= 4)
+	{
+		ctxt->table_size = (1 << (((6*(sent->length-4))/6) + 4));
 	}
-	table = (Table_connector**) xalloc(table_size * sizeof(Table_connector*));
-	for (i=0; i<table_size; i++) {
-		table[i] = NULL;
+	else
+	{
+		ctxt->table_size = (1 << 4);
 	}
+	ctxt->table = (Table_connector**) 
+		xalloc(ctxt->table_size * sizeof(Table_connector*));
+	for (i=0; i < ctxt->table_size; i++)
+	{
+		ctxt->table[i] = NULL;
+	}
 }
 
-static int hash(int lw, int rw, Connector *le, Connector *re, int cost) {
+static int hash(int table_size,
+                int lw, int rw, Connector *le, Connector *re, int cost)
+{
 	int i;
 	i = 0;
 
@@ -192,20 +206,26 @@
 {
 	int i;
 	Table_connector *t, *x;
+	count_context_t *ctxt = sent->count_ctxt;
 
-	for (i=0; i<table_size; i++) {
-		for(t = table[i]; t!= NULL; t=x) {
+	for (i=0; i<ctxt->table_size; i++)
+	{
+		for(t = ctxt->table[i]; t!= NULL; t=x)
+		{
 			x = t->next;
 			xfree((void *) t, sizeof(Table_connector));
 		}
 	}
-	xfree((void *) table, table_size * sizeof(Table_connector*));
+	xfree(ctxt->table, ctxt->table_size * sizeof(Table_connector*));
+	ctxt->table = NULL;
+	ctxt->table_size = 0;
 }
 
 /** 
  * Stores the value in the table.  Assumes it's not already there.
  */
-static Table_connector * table_store(int lw, int rw,
+static Table_connector * table_store(count_context_t *ctxt,
+                                     int lw, int rw,
                                      Connector *le, Connector *re,
                                      int cost, s64 count)
 {
@@ -215,10 +235,10 @@
 	n = (Table_connector *) xalloc(sizeof(Table_connector));
 	n->count = count;
 	n->lw = lw; n->rw = rw; n->le = le; n->re = re; n->cost = cost;
-	h = hash(lw, rw, le, re, cost);
-	t = table[h];
+	h = hash(ctxt->table_size,lw, rw, le, re, cost);
+	t = ctxt->table[h];
 	n->next = t;
-	table[h] = n;
+	ctxt->table[h] = n;
 	return n;
 }
 
@@ -230,7 +250,7 @@
                    int cost)
 {
 	Table_connector *t;
-	t = table[hash(lw, rw, le, re, cost)];
+	t = ctxt->table[hash(ctxt->table_size,lw, rw, le, re, cost)];
 	for (; t != NULL; t = t->next) {
 		if ((t->lw == lw) && (t->rw == rw) && (t->le == le) && (t->re == re)
 			&& (t->cost == cost))  return t;
@@ -242,7 +262,7 @@
 	if ((ctxt->current_resources != NULL) && 
 	     resources_exhausted(ctxt->current_resources))
 	{
-		return table_store(lw, rw, le, re, cost, 0);
+		return table_store(ctxt, lw, rw, le, re, cost, 0);
 	}
 	else return NULL;
 }
@@ -298,12 +318,12 @@
 
 	if (cost < 0) return 0;  /* will we ever call it with cost<0 ? */
 
-	t = find_table_pointer(sent->count_ctxt, lw, rw, le, re, cost);
+	t = find_table_pointer(ctxt, lw, rw, le, re, cost);
 
 	if (t == NULL) {
 		/* Create the table entry with a tentative cost of 0. 
 	    * This cost must be updated before we return. */
-		t = table_store(lw, rw, le, re, cost, 0);
+		t = table_store(ctxt, lw, rw, le, re, cost, 0);
 	} else {
 		return t->count;
 	}
@@ -563,7 +583,7 @@
 	if (i >= 0) return i;
 
 	if ((le == NULL) && (re == NULL) && ctxt->deletable[lw][rw]) {
-		table_store(lw, rw, le, re, 0, 1);
+		table_store(ctxt, lw, rw, le, re, 0, 1);
 		return 1;
 	}
 
@@ -609,7 +629,7 @@
 		put_match_list(sent, m1);
 		if (found != 0) break;
 	}
-	table_store(lw, rw, le, re, 0, found);
+	table_store(ctxt, lw, rw, le, re, 0, found);
 	return found;
 }
 
Index: link-grammar/corpus/corpus.h
===================================================================
--- link-grammar/corpus/corpus.h	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/corpus/corpus.h	(.../trunk)	(revision 26504)
@@ -16,26 +16,28 @@
 #include "../api-types.h"
 #include "../link-includes.h"
 
-typedef struct corpus_s Corpus;
-typedef struct sense_s Sense;
-
 Corpus * lg_corpus_new(void);
 void lg_corpus_delete(Corpus *);
 
 void lg_corpus_score(Sentence, Linkage_info *);
-Sense * lg_corpus_linkage_senses(Linkage);
+void lg_corpus_linkage_senses(Linkage);
 
-Sense *lg_sense_next(Sense *);
+Sense * lg_get_word_sense(Linkage_info *, int word);
+Sense * lg_sense_next(Sense *);
 int lg_sense_get_index(Sense *);
 const char * lg_sense_get_subscripted_word(Sense *);
 const char * lg_sense_get_disjunct(Sense *);
 const char * lg_sense_get_sense(Sense *);
 double lg_sense_get_score(Sense *);
-void lg_sense_delete(Sense *);
+void lg_sense_delete(Linkage_info *);
 
 #else /* USE_CORPUS */
 
 static inline void lg_corpus_score(Sentence s, Linkage_info *li) {}
+static inline Sense * lg_get_word_sense(Linkage_info *lif, int word) { return NULL; }
+static inline Sense * lg_sense_next(Sense *s ) {return NULL; }
+static inline const char * lg_sense_get_sense(Sense *s) { return NULL; }
+static inline double lg_sense_get_score(Sense *s) { return 0.0; }
 #endif /* USE_CORPUS */
 
 #endif /* _LINKGRAMMAR_CORPUS_H */
Index: link-grammar/corpus/Makefile.am
===================================================================
--- link-grammar/corpus/Makefile.am	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/corpus/Makefile.am	(.../trunk)	(revision 26504)
@@ -9,6 +9,8 @@
 
 liblink_corpus_la_LDFLAGS = -no-undefined
 
+liblink_corpus_la_LIBADD = ${SQLITE3_LIBS}
+
 liblink_corpus_la_SOURCES = \
 	corpus.h                 \
 	corpus.c
Index: link-grammar/corpus/corpus.c
===================================================================
--- link-grammar/corpus/corpus.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/corpus/corpus.c	(.../trunk)	(revision 26504)
@@ -23,6 +23,7 @@
 	sqlite3_stmt *rank_query;
 	sqlite3_stmt *sense_query;
 	char *errmsg;
+	int rc;
 };
 
 struct sense_s
@@ -42,8 +43,8 @@
 	Corpus *c = (Corpus *) user_data;
 	int rc;
 	sqlite3 *dbconn;
-	rc = sqlite3_open(dbname, &dbconn);
-	if (rc)
+	c->rc = sqlite3_open_v2(dbname, &dbconn, SQLITE_OPEN_READONLY, NULL);
+	if (c->rc)
 	{
 		sqlite3_close(dbconn);
 		return NULL;
@@ -72,8 +73,19 @@
 	c->dbconn = object_open("sql/disjuncts.db", db_file_open, c);
 	if (NULL == c->dbconn)
 	{
-		prt_error("Warning: Can't open database: %s\n",
-			sqlite3_errmsg(c->dbconn));
+		/* Very weird .. but if the database is not found, then sqlite
+		 * reports an "out of memory" error! So hide this misleading
+		 * error message.
+		 */
+		if (SQLITE_CANTOPEN == c->rc)
+		{
+			prt_error("Warning: Can't open database: File not found\n");
+		}
+		else
+		{ 
+			prt_error("Warning: Can't open database: %s\n",
+				sqlite3_errmsg(c->dbconn));
+		}
 		return c;
 	}
 
@@ -93,7 +105,7 @@
 	rc = sqlite3_prepare_v2(c->dbconn, 	
 		"SELECT word_sense, log_cond_probability FROM DisjunctSenses "
 		"WHERE inflected_word = ? AND disjunct = ? "
-		"ORDER BY log_cond_probability DESC;",
+		"ORDER BY log_cond_probability ASC;",
 		-1, &c->sense_query, NULL);
 	if (rc != SQLITE_OK)
 	{
@@ -231,10 +243,7 @@
 	/* No-op if the database is not open */
 	if (NULL == corp->dbconn) return;
 
-	if (NULL == lifo->disjunct_list_str[1])
-	{
-		lg_compute_disjunct_strings(sent, lifo);
-	}
+	lg_compute_disjunct_strings(sent, lifo);
 
 	/* Decrement nwords, so as to ignore the RIGHT-WALL */
 	nwords --;
@@ -270,7 +279,8 @@
 
 static Sense * lg_corpus_senses(Corpus *corp,
                                 const char * inflected_word,
-                                const char * disjunct)
+                                const char * disjunct,
+                                int wrd)
 {
 	double log_prob;
 	const unsigned char *sense;
@@ -310,6 +320,7 @@
 		sns->disjunct = disjunct;
 		sns->sense = strdup(sense);
 		sns->score = log_prob;
+		sns->word = wrd;
 
 		/* Get the next row, if any */
 		rc = sqlite3_step(corp->sense_query);
@@ -335,7 +346,7 @@
  * only an informational look-up.
  */
 
-Sense * lg_corpus_linkage_senses(Linkage linkage)
+void lg_corpus_linkage_senses(Linkage linkage)
 {
 	const char * infword;
 	Sentence sent = linkage->sent;
@@ -344,16 +355,22 @@
 	int nwords = sent->length;
 	Linkage_info *lifo = linkage->info;
 	int w;
-	Sense *head = NULL;
-	Sense *sns, *first, *last;
 
+	if (lifo->sense_list) return;
+
+	/* Set up the disjunct strings first */
+	lg_compute_disjunct_strings(sent, lifo);
+
+	lifo->nwords = nwords;
+	lifo->sense_list = (Sense **) malloc (nwords * sizeof (Sense *));
+	bzero (lifo->sense_list, nwords * sizeof (Sense *));
+
 	/* Decrement nwords, so as to ignore the RIGHT-WALL */
 	nwords --;
 
 	/* Loop over each word in the sentence (skipping LEFT-WALL, which is
 	 * word 0. */
-	// for (w=1; w<nwords; w++)
-	for (w=nwords-1; 0<w; w--)
+	for (w=1; w<nwords; w++)
 	{
 		/* If the word is not inflected, then sent->word[w].d is NULL */
 		if (sent->word[w].d)
@@ -361,28 +378,21 @@
 		else
 			infword = sent->word[w].string;
 
-		first = lg_corpus_senses(corp, infword, lifo->disjunct_list_str[w]);
-		if (first)
-		{
-			last = first;
-			while (last->next)
-			{
-				last->word = w;
-				last = last->next;
-			}
-			last->word = w;
-
-			last->next = head;
-			head = first;
-		}
+		lifo->sense_list[w] = lg_corpus_senses(corp, infword, 
+		                        lifo->disjunct_list_str[w], w);
 	}
-
-	return head;
 }
 
 /* ========================================================= */
 /* Return bits and pieces of the sense assignments */
 
+Sense * lg_get_word_sense(Linkage_info *lifo, int word)
+{
+	if (!lifo->sense_list) return NULL;
+	if (lifo->nwords <= word) return NULL;
+	return lifo->sense_list[word];
+}
+
 Sense * lg_sense_next(Sense *sns)
 {
 	return sns->next;
@@ -413,15 +423,26 @@
 	return sns->score;
 }
 
-void lg_sense_delete(Sense *sns)
+void lg_sense_delete(Linkage_info *lifo)
 {
-	while (sns)
+	size_t nwords = lifo->nwords;
+	size_t w;
+
+	if (NULL == lifo->sense_list) return;
+
+	for (w=0; w<nwords; w++)
 	{
-		Sense * nxt = sns->next;
-		free(sns->sense);
-		free(sns);
-		sns = nxt;
+		Sense *sns = lifo->sense_list[w];
+		while (sns)
+		{
+			Sense * nxt = sns->next;
+			free(sns->sense);
+			free(sns);
+			sns = nxt;
+		}
 	}
+	free (lifo->sense_list);
+	lifo->sense_list = NULL;
 }
 
 /* ======================= END OF FILE ===================== */
Index: link-grammar/command-line.c
===================================================================
--- link-grammar/command-line.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/command-line.c	(.../trunk)	(revision 26504)
@@ -226,15 +226,15 @@
 		printf("can be abbreviated.  Here is a list of the commands:\n\n");
 		for (i=0; user_command[i].s != NULL; i++) {
 			printf(" !");
-            left_print_string(stdout, user_command[i].s, "                  ");
+            left_print_string(stdout, user_command[i].s, "               ");
             left_print_string(stdout, user_command[i].str, "                                                    ");
 			printf("\n");
 		}
-		printf(" !!<string>		 Print all the dictionary words matching <string>.\n");
-		printf("					Also print the number of disjuncts of each.\n");
+		printf(" !!<string>      Print all the dictionary words matching <string>.\n");
+		printf("                 Also print the number of disjuncts of each.\n");
 		printf("\n");
-		printf(" !<var>			 Toggle the specified boolean variable.\n");
-		printf(" !<var>=<val>	   Assign that value to that variable.\n");
+		printf(" !<var>          Toggle the specified boolean variable.\n");
+		printf(" !<var>=<val>    Assign that value to that variable.\n");
 		return;
 	}
 
Index: link-grammar/link-grammar-java.def
===================================================================
--- link-grammar/link-grammar-java.def	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/link-grammar-java.def	(.../trunk)	(revision 26504)
@@ -17,6 +17,8 @@
 Java_org_linkgrammar_LinkGrammar_getLinkageNumViolations
 Java_org_linkgrammar_LinkGrammar_getLinkageDisjunct
 Java_org_linkgrammar_LinkGrammar_getLinkageWord
+Java_org_linkgrammar_LinkGrammar_getLinkageSense
+Java_org_linkgrammar_LinkGrammar_getLinkageSenseScore
 Java_org_linkgrammar_LinkGrammar_makeLinkage
 Java_org_linkgrammar_LinkGrammar_getNumLinkages
 Java_org_linkgrammar_LinkGrammar_getNumLinks
Index: link-grammar/Makefile.am
===================================================================
--- link-grammar/Makefile.am	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/Makefile.am	(.../trunk)	(revision 26504)
@@ -38,8 +38,8 @@
 liblink_grammar_java_la_LDFLAGS += -D_JNI_IMPLEMENTATION_ -Wl,--kill-at
 endif
 
-liblink_grammar_la_LIBADD  = 
-liblink_grammar_java_la_LIBADD  = liblink-grammar.la
+liblink_grammar_la_LIBADD  =  ${REGEX_LIBS}
+liblink_grammar_java_la_LIBADD  = liblink-grammar.la  ${REGEX_LIBS}
 
 if HAVE_HUNSPELL
 liblink_grammar_la_LIBADD  +=  ${HUNSPELL_LIBS}
Index: link-grammar/structures.h
===================================================================
--- link-grammar/structures.h	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/structures.h	(.../trunk)	(revision 26504)
@@ -335,7 +335,11 @@
     double corpus_cost;
     Andlist * andlist;
     int island[MAX_SENTENCE];
-    char *disjunct_list_str[MAX_SENTENCE];
+    size_t nwords;
+    char **disjunct_list_str;
+#ifdef USE_CORPUS
+    Sense **sense_list;
+#endif
 };
 
 struct List_o_links_struct
Index: link-grammar/print.c
===================================================================
--- link-grammar/print.c	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ link-grammar/print.c	(.../trunk)	(revision 26504)
@@ -142,23 +142,28 @@
 	String * s = string_new();
 	char * sense_string;
 #if USE_CORPUS
-	Sense *sns, *head;
+	Linkage_info *lifo = linkage->info;
+	Sense *sns;
+	size_t w, nwords;
 
-	head = lg_corpus_linkage_senses(linkage);
+	lg_corpus_linkage_senses(linkage);
 
-	sns = head;
-	while (sns)
+	nwords = lifo->nwords;
+	for (w=0; w<nwords; w++)
 	{
-		int idx = lg_sense_get_index(sns);
-		const char * wd = lg_sense_get_subscripted_word(sns);
-		const char * dj = lg_sense_get_disjunct(sns);
-		const char * sense = lg_sense_get_sense(sns);
-		double score = lg_sense_get_score(sns);
-		append_string(s, "%d %s dj=%s sense=%s score=%f\n",
-		              idx, wd, dj, sense, score);
-		sns = lg_sense_next(sns);
+		sns = lg_get_word_sense(lifo, w);
+		while (sns)
+		{
+			int idx = lg_sense_get_index(sns);
+			const char * wd = lg_sense_get_subscripted_word(sns);
+			const char * dj = lg_sense_get_disjunct(sns);
+			const char * sense = lg_sense_get_sense(sns);
+			double score = lg_sense_get_score(sns);
+			append_string(s, "%d %s dj=%s sense=%s score=%f\n",
+			              idx, wd, dj, sense, score);
+			sns = lg_sense_next(sns);
+		}
 	}
-	lg_sense_delete(head);
 
 #else
 	append_string(s, "Corpus statstics is not enabled in this version\n");
Index: AUTHORS
===================================================================
--- AUTHORS	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ AUTHORS	(.../trunk)	(revision 26504)
@@ -7,3 +7,15 @@
 Much additional work has been done by many different developers.
 The current lead developer is 
 Linas Vepstas: http://linas.org/
+
+Some of the people who have contributed patches and fixes include:
+(In alphabetical order)
+
+Borislav Iordanov <borislav.iordanov_at_gmail.com>
+Dom Lachowicz <domlachowicz_at_gmail.com>
+Marc Maurer <uwog_at_uwog.net>
+Evgenii Philippov <efilippov_at_gmail.com>
+Sampo Pyysalo
+Murilo Saraiva de Queiroz <muriloq_at_gmail.com>
+Fridrich Strba <fridrich.strba_at_bluewin.ch>
+Peter Szolovits
Index: configure.in
===================================================================
--- configure.in	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ configure.in	(.../trunk)	(revision 26504)
@@ -11,7 +11,7 @@
 dnl     3) Increment when interfaces not changed at all,
 dnl               only bug fixes or internal changes made.
 dnl     4b) Set to zero when adding, removing or changing interfaces.
-LINK_MICRO_VERSION=5
+LINK_MICRO_VERSION=6
 dnl
 dnl     Set this too
 MAJOR_VERSION_PLUS_MINOR_VERSION=`expr $LINK_MAJOR_VERSION + $LINK_MINOR_VERSION`
@@ -160,6 +160,15 @@
 AM_CONDITIONAL(HAVE_EDITLINE, test x${edlin} = xyes)
 
 dnl ====================================================================
+
+AC_CHECK_HEADER([regex.h],,[AC_MSG_ERROR([No regex.h header found])])
+
+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
+               [REGEX_LIBS=-lregex],
+               [AC_MSG_ERROR([No regex library found])])])
+AC_SUBST(REGEX_LIBS)
+
+dnl ====================================================================
 dnl check compiler flags
 
 AC_DEFUN([LINK_CC_TRY_FLAG], [
Index: ChangeLog
===================================================================
--- ChangeLog	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ ChangeLog	(.../trunk)	(revision 26504)
@@ -1,3 +1,11 @@
+Version 4.5.6 (??? 2009)
+ * Bugfix: fix non-thread-safe usage.
+ * Changes to enable MinGW/Windows to compile.
+ * Update of MSVC6 build files
+ * Fix: pizza, fries, chopsticks.
+ * Export word-sense database to Java apps.
+ * Fix: "Was the man drunk or crazy or both?"
+
 Version 4.5.5 (10 May 2009) includes the following changes:
  * Bugfix: crash for zero-length sentences.
 
Index: README
===================================================================
--- README	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ README	(.../trunk)	(revision 26504)
@@ -1,12 +1,12 @@
 
                        Link Grammar Parser 
                        -------------------
-                          Version 4.5.3
+                          Version 4.5.6
 
 The Link Grammar Parser implements the Sleator/Temperley/Lafferty
 theory of natural language parsing. This version of the parser is
 an extended, expanded version of the last official CMU release, and
-includes many enhancments and fixes created by many different
+includes many enhancements and fixes created by many different
 developers.  This latest version incorporates a substantial part (but
 not all) of the BioLG project.
 
@@ -62,7 +62,7 @@
    no malicious changes were made to the code internals by third
    parties. The signatures can be checked with the gpg command:
 
-   gpg --verify link-grammar-4.3.10.tar.gz.asc
+   gpg --verify link-grammar-4.5.6.tar.gz.asc
 
    which should generate output identical to (except for the date):
 
@@ -85,10 +85,12 @@
    To install, change user to "root" and say
 
         make install
+        ldconfig
 
-   This will install the lib-link-grammar.so library into /usr/local/lib
-   the header files in /usr/local/include/link-grammar
-   and the dictionaries into /usr/local/share/link-grammar.
+   This will install the lib-link-grammar.so library into /usr/local/lib,
+   the header files in /usr/local/include/link-grammar, and the
+   dictionaries into /usr/local/share/link-grammar.  Running 'ldconfig'
+   will rebuild the shared library cache.
 
    By default, the Makefiles attempt to build the Java bindings.
    The use of the Java bindings is *OPTIONAL*; you do not need these if
@@ -105,6 +107,10 @@
    By using pkg-config (see below), non-standard install locations
    can be automatically detected.
 
+   Additional config options are printed by
+
+      ./configure --help
+
    The system has been tested and works well on 32 and 64-bit Linux
    systems, FreeBSD, MacOSX, as well as on many Microsoft Windows 
    systems, under various different Windows development environments.
@@ -135,6 +141,12 @@
     other utilities.  Download and install MinGW, MSYS and MSYS-DTK from
     http://mingw.org .
 
+    Link-grammar now requires a working version of POSIX-standard regex
+    libraries. Since these are not provided by Microsoft, a copy must be
+    obtained elsewhere. One possibility is from the gnuwin32 system:
+    http://gnuwin32.sourceforge.net/packages/regex.htm 
+    http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/regex.README
+
     Then build and install link-grammar with
 
        ./configure
@@ -164,23 +176,27 @@
        .libs/jni-client.o /usr/local/bin/link-grammar.dll \
        -o /usr/local/bin/link-grammar-java.dll
 
-    This will create link-grammar.dll and link-grammar-java.dll in the directory
-    c:\msys\1.0\local\bin . These files, together with link-grammar-*.jar, will
-    be used by Java programs.
+    This will create link-grammar.dll and link-grammar-java.dll in the
+    directory c:\msys\1.0\local\bin . These files, together with 
+    link-grammar-*.jar, will be used by Java programs.
 
+    Make sure that this directory is in the %PATH setting, as otherwise, 
+    the DLL's will not be found.
+
     Alternately, Windows users who have access to the "Microsoft Visual C"
     product may wish to use the project files in the msvc6 directory, or
     alternately, those in the msvc9 directory.
 
+
 RUNNING the program:
 --------------------
    To run the program issue the Unix command:
 
        ./link-parser
 
-   This starts the program.  Help is available there with "!help".  A
-   number of user-settable variables control what happens.  "!var" shows
-   these variables and their current values.
+   This starts the program.  The program has many user-settable variables
+   and options. These can be displayed by entering !var at the link-parser
+   prompt.  Entering !help will display some additional commands.
 
    The dictionaries contain some utf-8 punctuation. These may generate
    errors for users in a non-utf-8 locale, such as the "C" locale.
@@ -190,6 +206,9 @@
 
    at the shell prompt.
 
+
+TESTING the program:
+--------------------
    The program can run in batch mode for testing the system on a large
    number of sentences.  The following command runs the parser on
    a file called 4.0.batch
@@ -199,11 +218,11 @@
    The line "!batch" near the top of 4.0.batch turns on batch mode.  In
    this mode sentences labeled with an initial "*" should be rejected
    and those not starting with a "*" should be accepted.  The current
-   batch file does report some errors; there are a collection of
-   failing parses located at the end. Work is ongoing to fix these.
+   batch file does report some errors, as do the files "4.0.biolg.batch"
+   and "4.0.fixes.batch".  Work is ongoing to fix these.
 
-   The 4.0.fixes.batch file contains sentences that have been fixed 
-   since the original 4.1 release of link-grammar. The 4.0.biolg.batch
+   The "4.0.fixes.batch" file contains sentences that have been fixed 
+   since the original 4.1 release of link-grammar. The "4.0.biolg.batch"
    contains biology/medical-text sentences from the BioLG project.
 
 
@@ -220,8 +239,8 @@
    a sentence containing N words. This algorithm is more or less a 
    chart parser, a variant of the Earley parser.
 
-   The SAT sovler aims to replace the chart parser with an algorithm
-   based on Boolean Satistfiability Theory; specifically using the 
+   The SAT solver aims to replace the chart parser with an algorithm
+   based on Boolean Satisfiability Theory; specifically using the 
    MiniSAT solver. The SAT solver has a bit more overhead for shorter
    sentences, but is significantly faster for long sentences.  To work
    properly, it needs to be attached to a parse ranking system.  This
@@ -233,18 +252,19 @@
 
    prior to compiling.
 
+
 Corpus Statistics:
 ------------------
    The parser now contains some experimental code for using corpus
    statistics to provide a parse ranking, and to assign WordNet word 
-   senses to word, based on thier grammatical usage.  An overview of 
+   senses to word, based on their grammatical usage.  An overview of 
    the idea is given on the OpenCog blog, here:
 
    http://brainwave.opencog.org/2009/01/12/determining-word-senses-from-grammatical-usage/
 
-   It is planned that the Corpus statisics database will be used to
+   It is planned that the Corpus statistics database will be used to
    guide the SAT solver.  Dictionaries are available upon request. 
-   To enable the corpus statistcs, specify
+   To enable the corpus statistics, specify
 
       ./configure --enable-sat-solver
 
@@ -279,7 +299,7 @@
 
 JAVA bindings:
 --------------
-   This release includes Java bindings.  Thier use is optional. 
+   This release includes Java bindings.  Their use is optional. 
 
    The bindings will be built automatically if jni.h can be found.
    Some common java JVM distributions (most notably, the ones from Sun)
@@ -393,13 +413,13 @@
     it would be nice to have an incremental parsing, phrase by phrase,
     using a Viterbi-like algorithm to obtain the parse. Thus, for example,
     the parse of the last half of a long, run-on sentence should not be
-    sensitive to the parse of the begining of the sentence.
+    sensitive to the parse of the beginning of the sentence.
 
     Doing so would help with combinatorial explosion. So, for example,
     if the first half of a sentence has 4 plausible parses, and the
     last half has 4 more, then link-grammar reports 16 parses total.
     It would be much, much more useful to instead be given the
-    factored results: i.e. the for plausbile parses for the
+    factored results: i.e. the for plausible parses for the
     first half, and the four plausible parses for the last half.
     The lower combinatoric stress would ease the burden on
     downstream users of link-grammar.
@@ -416,13 +436,22 @@
       -- Split out parse-options, so that the command-line client
          options are not in the parse-options struct.
 
+   Hand-refining verb patterns:
+      A good reference for refining verb usage patterns is:
+      COBUILD GRAMMAR PATTERNS 1: VERBS
+      from THE COBUILD SERIES /from/ THE BANK OF ENGLISH
+      HARPER COLLINS
+      online at https://arts-ccr-002.bham.ac.uk/ccr/patgram/
+      http://www.corpus.bham.ac.uk/publications/index.shtml
+
+
    Quotations: Currently, tokenize.c ignores all ASCII double-quotes 
       (grep for "quote_found" in the source). However, it does not do this
       for the various "curly" UTF8 quotes, such as ‘these’ and “these”.
       This results is some ugly parsing for sentences containing such 
       quotes. (Note that these are in 4.0.affix).
 
-   no-links-cross: Link Grammar uses a constraint that all linakges must
+   no-links-cross: Link Grammar uses a constraint that all linkages must
       be planar graphs. While this is mostly correct, it would probably
       be more correct to use "landmark transitivity" as articulated by
       Hudson in the Word Grammar theory.  This might allow the elimination
@@ -461,7 +490,7 @@
      different meanings for the verb "tend", and the grammatical
      constructions allowed for one meaning are not the same as those
      allowed for the other. Yet, the link rules for "tend.v" have
-     to accomodate both senses, thus making the rules rather complex.
+     to accommodate both senses, thus making the rules rather complex.
      Worse, it potentially allows for non-sense constructions.
      If, instead, we allowed the dictionary to contain different
      rules for "tend.meaning1" and "tend.meaning2", the rules would
Index: data/en/4.0.dict
===================================================================
--- data/en/4.0.dict	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/4.0.dict	(.../trunk)	(revision 26504)
@@ -510,7 +510,8 @@
 this.p: <noun-main-h>;
 this.d: ({AL-} & D*u+) or DTn+;
 these: <noun-main-p> or ({AL-} & (Dmc+ or DD+));
-both: Dmc+ or E+ or ({M+ or (ALx+ & Jp+)} & <noun-main-p>);
+both.d: Dmc+ or E+ or ({M+ or (ALx+ & Jp+)} & <noun-main-p>);
+both.a: Paf-;
 half: {EN-} & (NJ+ or ((({DD-} & {@Mp+ or (R+ & B+)}) or (AL+ & J+))
 & <noun-main-x>));
 many: (H- & (Dmc+ or ND+ or NIn+ or TQ+)) or (AM- & (Dmcy+ or Oy- or Jy-)) or 
@@ -756,7 +757,7 @@
 %EQUATIONS ETC.
 
 % "verb" use, e.g. "( p < 0.01 )" for "( p is less than 0.01 )"
-=.v <.v >.v *.v "/".v +.v -.v x.v: 
+=.v <.v >.v *.v "/.v" +.v -.v x.v: 
 (S- or EQ-) & O+ & 
 (EQ+ or (Xd- & (Xc+ or [[[()]]]) & MX-));
 
Index: data/en/4.0.biolg.batch
===================================================================
--- data/en/4.0.biolg.batch	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/4.0.biolg.batch	(.../trunk)	(revision 26504)
@@ -393,6 +393,7 @@
 A monomer is built up of strands
 
 % "in gel"
+% should have been in-gel to be grammatical -- could a spell cheker guess this?
 They were measured by in gel kinase assays
 
 
Index: data/en/4.0.fixes.batch
===================================================================
--- data/en/4.0.fixes.batch	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/4.0.fixes.batch	(.../trunk)	(revision 26504)
@@ -187,8 +187,11 @@
 He clutched a purseful of złoty.
 A chair is something you sit in.
 A bed is something you sleep in.
+He breaded the chicken in a mixture of flour and breadcrumbs.
+I had an off day.
+Kim eats pizza with chopsticks.
 
-He breaded the chicken in a mixture of flour and breadcrumbs.
+% drug culture vocabulary
 It smells like someone is smoking maryjane.
 It smells like someone is smoking pot.
 We brought back a kilo of boo from Mexico.
@@ -784,6 +787,9 @@
 Run's shoes are red.
 Ran's shoes are red.
 
+% ... or both -- drunk wants Pa link, both wants Opt link
+Was the man drunk or crazy or both?
+
 % Sentence containing UTF8 chars that can lead to i/o or 
 % word-boundary problems
 *Bitter gourdはにがうりだそうであってるのかはちょっと不安ですが翻訳ソフトでやくしてみました。
Index: data/en/words/words.n.1
===================================================================
--- data/en/words/words.n.1	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/words/words.n.1	(.../trunk)	(revision 26504)
@@ -238,7 +238,8 @@
 chimneysweep.n chimneysweeper.n chimp.n chimpanzee.n chin.n 
 chinchilla.n chink.n chip.n chipmunk.n chiropodist.n chiropractor.n 
 chirp.n chirrup.n chisel.n chit.n choc.n choir.n choirboy.n choke.n 
-choker.n chop.n chopper.n chorale.n chord.n chore.n choreographer.n 
+choker.n chop.n chopper.n chopstick.n 
+chorale.n chord.n chore.n choreographer.n 
 chorister.n chortle.n chorus.n christening.n chromosome.n chronicle.n 
 chronicler.n chronometer.n chrysalis.n chrysanthemum.n chuck.n 
 chuckle.n chug.n chum.s chump.n chunk.n churchgoer.n churchwarden.n 
@@ -957,7 +958,7 @@
 pipeful.n pipeline.n piper.n pipette.n pipsqueak.n piranha.n pirate.n 
 pirouette.n pistachio.s pistil.n pistol.n piston.n pit.n pitcher.n 
 pitchfork.n pitfall.n pithead.n pittance.n pituitary.n pivot.n pixie.n 
-pizza.n placard.n placebo.n placeseeker.n plagiarist.n plague.n 
+placard.n placebo.n placeseeker.n plagiarist.n plague.n 
 plain.n plaintiff.n plane.n planet.n planetarium.n plank.n planner.n 
 plant.n plantain.n plantation.n planter.n plate.n plateau.n plateful.n 
 platform.n platitude.n platoon.n platter.n platypus.n plaudit.n 
Index: data/en/words/words.n.4
===================================================================
--- data/en/words/words.n.4	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/words/words.n.4	(.../trunk)	(revision 26504)
@@ -291,7 +291,8 @@
 personification.n perspective.n persuasion.n perusal.n perversion.n 
 perversity.n pesticide.n pestilence.n pheasant.n phosphate.n 
 physiognomy.n physique.n pickle.n pidgin.p pie.n piety.n pigment.n pimento.n 
-pine.n pineapple.p pique.n piss.n pistachio.p pitch.n pity.n plaice.s plaque.n 
+pine.n pineapple.p pique.n piss.n pistachio.p pitch.n pity.n 
+pizza.n plaice.s plaque.n 
 plaster.n play.n pleasure.n pluck.n plurality.n plutocracy.n 
 poinsettia.p poison.n 
 poker.n polarity.n polarization.n policy.n polish.n pop.n poplar.n 
Index: data/en/words/words.n.2.s
===================================================================
--- data/en/words/words.n.2.s	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ data/en/words/words.n.2.s	(.../trunk)	(revision 26504)
@@ -340,7 +340,7 @@
 chimpanzees.n chimps.n chinchillas.n chinks.n chins.n chipmunks.n 
 chips.n chiropodists.n chiropractors.n chirps.n chirrups.n chisels.n 
 chits.n chives.n chocolates.n chocs.n choices.n choirboys.n choirs.n 
-chokers.n chokes.n choppers.n chops.n chorales.n chords.n 
+chokers.n chokes.n choppers.n chops.n chopsticks.n chorales.n chords.n 
 choreographers.n chores.n choristers.n chortles.n choruses.n chows.n 
 christenings.n chromosomes.n chroniclers.n chronicles.n chronologies.n 
 chronometers.n chrysalises.n chrysanthemums.n chuckles.n chucks.n 
@@ -758,7 +758,7 @@
 freebooters.n freedoms.n freeholders.n freeholds.n freeways.n 
 freezers.n freezes.n freighters.n frequencies.n frescos.n frets.n 
 friars.n fricassees.n fricatives.n fridges.n friends.n friendships.n 
-friers.n friezes.n frigates.n frights.n frills.n fringes.n frissons.n 
+fries.n friers.n friezes.n frigates.n frights.n frills.n fringes.n frissons.n 
 fritters.n frivolities.n frocks.n frogs.n frolics.n frontages.n 
 frontiers.n frontispieces.n fronts.n frosts.n frowns.n fruitcakes.n 
 fruits.n frustrations.n fryers.n fuchsias.n fuckers.n fuels.n 
Index: Makefile.am
===================================================================
--- Makefile.am	(.../tags/link-grammar-4-5-5)	(revision 26504)
+++ Makefile.am	(.../trunk)	(revision 26504)
@@ -11,11 +11,17 @@
 linkgrammar-@VERSION@.jar:
 	ant
 
-javadir=$(DESTDIR)/$(datadir)/java
+javadir=$(datadir)/java
 java_DATA = linkgrammar-@VERSION@.jar
 
+if OS_WIN32
+LN_S = cp
+else
+LN_SF = ln -sf
+endif
+
 install-data-hook: 
-	ln -sf $(javadir)/$(java_DATA) $(javadir)/linkgrammar.jar
+	${LN_SF} ${javadir}/${java_DATA} ${DESTDIR}/${javadir}/linkgrammar.jar
 endif

Places

File link-grammar-4.5.5-fridrich.patch of Package mingw32-link-grammar (Revision 7e68b195608fcf2c31fd2715a40d2921)

Places