From 1e7d498b6cd24385da3ff66da8c006e66d496b86 Mon Sep 17 00:00:00 2001 From: bringert Date: Tue, 21 Mar 2006 13:20:03 +0000 Subject: [PATCH] Set GF_LIB_PATH to the dist dir when building grammar-dist. --- lib/resource-1.0/Makefile | 7 +++++-- src/Makefile | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index 31a6e9ef4..36e1e8611 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -1,6 +1,9 @@ -.PHONY: all test pretest langs present mathematical multimodal compiled treebank stat gfdoc clean +.PHONY: show-path all test pretest langs present mathematical multimodal compiled treebank stat gfdoc clean -all: present mathematical multimodal langs compiled +all: show-path present mathematical multimodal langs compiled + +show-path: + @echo GF_LIB_PATH=$(GF_LIB_PATH) test: echo "gr -cat=Text -number=11 -prob | tb" | gf -nocf -probs=lang.gfprob langs.gfcm diff --git a/src/Makefile b/src/Makefile index 9e3681cc4..c12de6d0f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -222,7 +222,7 @@ grammar-dist: -rm -rf $(GRAMMAR_DIST_DIR) mkdir $(GRAMMAR_DIST_DIR) cp -r ../_darcs/current/{lib,examples} $(GRAMMAR_DIST_DIR) - $(MAKE) -C $(GRAMMAR_DIST_DIR)/lib/resource-1.0 present mathematical multimodal langs + $(MAKE) GF_LIB_PATH=.. -C $(GRAMMAR_DIST_DIR)/lib/resource-1.0 show-path present mathematical multimodal langs $(TAR) -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR) rm -rf $(GRAMMAR_DIST_DIR)