From 92ffc5072ae2847c8d292bad66b5533033912a12 Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 11 Sep 2008 08:35:17 +0000 Subject: [PATCH] Fix binary-dist to include gfc and exclude compiled grammars, since the latter didn't work anyway. NOTE: you must re-run autoconf (actually the previous patch is the one that requires this). --- src/Makefile | 7 ++++--- src/Makefile.binary | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index af69af950..4279c1da3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -205,13 +205,14 @@ binary-dist: mkdir $(BIN_DIST_DIR) mkdir $(BIN_DIST_DIR)/lib ./configure --host="$(host)" --build="$(build)" - $(MAKE) all gfdoc + $(MAKE) gfc gfdoc $(INSTALL) ../bin/$(GF_EXE) tools/$(GF_DOC_EXE) $(BIN_DIST_DIR) - $(INSTALL) configure config.guess config.sub install-sh $(BIN_DIST_DIR) + $(INSTALL) configure config.guess config.sub install-sh config.mk.in $(BIN_DIST_DIR) + $(INSTALL) gfc.in $(BIN_DIST_DIR) $(INSTALL) -m 0644 ../README ../LICENSE $(BIN_DIST_DIR) $(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL $(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile - $(TAR) -C $(BIN_DIST_DIR)/lib -zxf ../lib/compiled.tgz +# $(TAR) -C $(BIN_DIST_DIR)/lib -zxf ../lib/compiled.tgz $(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR) rm -rf $(BIN_DIST_DIR) diff --git a/src/Makefile.binary b/src/Makefile.binary index 9eb62c382..0ae18a2e7 100644 --- a/src/Makefile.binary +++ b/src/Makefile.binary @@ -8,6 +8,7 @@ GF_LIB_DIR=$(GF_DATA_DIR)/lib install: $(INSTALL) -d $(bindir) $(INSTALL) gf$(EXEEXT) gfdoc$(EXEEXT) $(bindir) + $(INSTALL) gfc$(EXEEXT) $(bindir) $(INSTALL) -d $(GF_DATA_DIR) cp -r lib $(GF_DATA_DIR)