From de62a2f8e607a6494b9158eeea99e157bb55a3f6 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Thu, 5 Jul 2007 12:25:00 +0000
Subject: [PATCH] Use compiled.tgz in dist and install-lib.

---
 src/Makefile        | 10 +++-------
 src/Makefile.binary | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9062233e6..ddab0dd43 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,8 +26,6 @@ MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi
 GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
 GF_LIB_DIR=$(GF_DATA_DIR)/lib
 
-GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present
-
 EMBED = GF/Embed/TemplateApp
 
 # use the temporary binary file name 'gf-bin' to not clash with directory 'GF' 
@@ -208,7 +206,7 @@ gfcc2c:
 #
 
 lib:
-	$(MAKE) -C ../lib/resource-1.0 $(GF_LIB_PACKAGES)
+	$(MAKE) -C ../lib/resource-1.0 clean compiled
 
 #
 # Distribution
@@ -247,8 +245,7 @@ binary-dist:
 	$(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL
 	$(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile
 	$(MAKE) lib
-	$(INSTALL) -d $(addprefix $(BIN_DIST_DIR)/lib/, $(GF_LIB_PACKAGES))
-	(cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '../src/$(BIN_DIST_DIR)/lib/{}' ';')
+	$(TAR) -C $(BIN_DIST_DIR) -zxf ../lib/compiled.tgz
 	$(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR)
 	rm -rf $(BIN_DIST_DIR)
 
@@ -283,8 +280,7 @@ install-gfdoc:
 
 install-lib:
 	$(INSTALL) -d $(GF_LIB_DIR)
-	$(INSTALL) -d $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES))
-	(cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '$(GF_LIB_DIR)/{}' ';')
+	$(TAR) -C $(GF_LIB_DIR) -zxf ../lib/compiled.tgz
 
 install-editor:
 	$(INSTALL) -d $(GF_DATA_DIR)
diff --git a/src/Makefile.binary b/src/Makefile.binary
index 53cd6135d..ab52185fd 100644
--- a/src/Makefile.binary
+++ b/src/Makefile.binary
@@ -3,8 +3,6 @@ include config.mk
 GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
 GF_LIB_DIR=$(GF_DATA_DIR)/lib
 
-GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present
-
 .PHONY: install uninstall
 
 install: 
@@ -13,15 +11,13 @@ install:
 	$(INSTALL) -d $(GF_DATA_DIR)
 	$(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR)
 	$(INSTALL) -m 0644 gfeditor.jar $(GF_DATA_DIR)
-	$(INSTALL) -d $(GF_LIB_DIR)
-	$(INSTALL) -d $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES))
-	(cd lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '$(GF_LIB_DIR)/{}' ';')
+	cp -r lib $(GF_DATA_DIR)
 
 uninstall:
 	-rm -f $(bindir)/gf$(EXEEXT) $(bindir)/gfdoc$(EXEEXT) $(bindir)/jgf $(bindir)/gfeditor
 	-rm -f $(GF_DATA_DIR)/gf-java.jar
 	-rm -f $(GF_DATA_DIR)/gfeditor.jar
-	-rm -f $(addsuffix /*.gf?, $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)))
-	-rmdir $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES))
+	-rm -f $GF_LIB_DIR)/*/*.gf{c,r,cm}
+	-rmdir $(GF_LIB_DIR)/*
 	-rmdir $(GF_LIB_DIR)
 	-rmdir $(GF_DATA_DIR)