From 7c3a46821b5efc8e7f8e1be1f72f19326e7caec7 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Mon, 9 May 2005 03:56:00 +0000 Subject: [PATCH] Really include font patch git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/freeze-0_9_6@21203 72102866-910b-0410-8b05-ffd578937521 --- Fonts/GNUmakefile.postamble | 5 +++-- GNUmakefile | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Fonts/GNUmakefile.postamble b/Fonts/GNUmakefile.postamble index 5324651..2233a53 100644 --- a/Fonts/GNUmakefile.postamble +++ b/Fonts/GNUmakefile.postamble @@ -34,14 +34,15 @@ # Things to do after installing after-install:: + mkdir -p $(GNUSTEP_INSTALLATION_DIR)/$(back-resources_RESOURCE_FILES_INSTALL_DIR) for file in $(FONT_INSTALL_FILES); do \ - ($(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $$file) | (cd $(GNUSTEP_SYSTEM_ROOT)/$(back-resources_RESOURCE_FILES_INSTALL_DIR); $(TAR) xf -) ;\ + ($(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $$file) | (cd $(GNUSTEP_INSTALLATION_DIR)/$(back-resources_RESOURCE_FILES_INSTALL_DIR); $(TAR) xf -) ;\ done # Things to do before uninstalling before-uninstall:: for file in $(FONT_INSTALL_FILES); do \ - rm -rf $(GNUSTEP_SYSTEM_ROOT)/$(back-resources_RESOURCE_FILES_INSTALL_DIR)/$$file;\ + rm -rf $(GNUSTEP_INSTALLATION_DIR)/$(back-resources_RESOURCE_FILES_INSTALL_DIR)/$$file;\ done # Things to do after uninstalling diff --git a/GNUmakefile b/GNUmakefile index 9ac366a..d486c71 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,7 +40,11 @@ include ./Version # # The list of subproject directories # -SUBPROJECTS = Source Fonts Tools +SUBPROJECTS = Source Tools + +ifneq ($(fonts), no) +SUBPROJECTS += Fonts +endif -include GNUmakefile.preamble