msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Use compiled.tgz in dist and install-lib.

Browse Source
This commit is contained in:
bringert
2007-07-05 12:25:00 +00:00
parent aeb45fa03e
commit de62a2f8e6
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

@@ -26,8 +26,6 @@ MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi
GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION) GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
GF_LIB_DIR=$(GF_DATA_DIR)/lib GF_LIB_DIR=$(GF_DATA_DIR)/lib
GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present
EMBED = GF/Embed/TemplateApp EMBED = GF/Embed/TemplateApp
# use the temporary binary file name 'gf-bin' to not clash with directory 'GF' # use the temporary binary file name 'gf-bin' to not clash with directory 'GF'
@@ -208,7 +206,7 @@ gfcc2c:
# #
lib: lib:
$(MAKE) -C ../lib/resource-1.0 $(GF_LIB_PACKAGES) $(MAKE) -C ../lib/resource-1.0 clean compiled
# #
# Distribution # Distribution
@@ -247,8 +245,7 @@ binary-dist:
$(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL $(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL
$(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile $(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile
$(MAKE) lib $(MAKE) lib
$(INSTALL) -d $(addprefix $(BIN_DIST_DIR)/lib/, $(GF_LIB_PACKAGES)) $(TAR) -C $(BIN_DIST_DIR) -zxf ../lib/compiled.tgz
(cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '../src/$(BIN_DIST_DIR)/lib/{}' ';')
$(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR) $(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR)
rm -rf $(BIN_DIST_DIR) rm -rf $(BIN_DIST_DIR)
@@ -283,8 +280,7 @@ install-gfdoc:
install-lib: install-lib:
$(INSTALL) -d $(GF_LIB_DIR) $(INSTALL) -d $(GF_LIB_DIR)
$(INSTALL) -d $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)) $(TAR) -C $(GF_LIB_DIR) -zxf ../lib/compiled.tgz
(cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '$(GF_LIB_DIR)/{}' ';')
install-editor: install-editor:
$(INSTALL) -d $(GF_DATA_DIR) $(INSTALL) -d $(GF_DATA_DIR)

10
src/Makefile.binary
View File

@@ -3,8 +3,6 @@ include config.mk
GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION) GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
GF_LIB_DIR=$(GF_DATA_DIR)/lib GF_LIB_DIR=$(GF_DATA_DIR)/lib
GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present
.PHONY: install uninstall .PHONY: install uninstall
install: install:
@@ -13,15 +11,13 @@ install:
$(INSTALL) -d $(GF_DATA_DIR) $(INSTALL) -d $(GF_DATA_DIR)
$(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR) $(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR)
$(INSTALL) -m 0644 gfeditor.jar $(GF_DATA_DIR) $(INSTALL) -m 0644 gfeditor.jar $(GF_DATA_DIR)
$(INSTALL) -d $(GF_LIB_DIR) cp -r lib $(GF_DATA_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)/{}' ';')
uninstall: uninstall:
-rm -f $(bindir)/gf$(EXEEXT) $(bindir)/gfdoc$(EXEEXT) $(bindir)/jgf $(bindir)/gfeditor -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)/gf-java.jar
-rm -f $(GF_DATA_DIR)/gfeditor.jar -rm -f $(GF_DATA_DIR)/gfeditor.jar
-rm -f $(addsuffix /*.gf?, $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES))) -rm -f $GF_LIB_DIR)/*/*.gf{c,r,cm}
-rmdir $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)) -rmdir $(GF_LIB_DIR)/*
-rmdir $(GF_LIB_DIR) -rmdir $(GF_LIB_DIR)
-rmdir $(GF_DATA_DIR) -rmdir $(GF_DATA_DIR)