From a140b18bbeb2911ff914c02b19b7dd38bcbdd2a3 Mon Sep 17 00:00:00 2001 From: nicola Date: Wed, 14 Feb 2007 12:13:46 +0000 Subject: [PATCH] Update for new gnustep-make git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24550 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Resources/GNUmakefile | 3 +++ Source/GNUmakefile | 3 +++ 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index fc2fef781..77dd25dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-14 Nicola Pero + + * Source/GNUmakefile (libgui-resources_INSTALL_DIR): New variable + for newer gnustep-makes. + * Resources/GNUmakefile (gui-resources_INSTALL_DIR): Same change. + 2007-02-09 Adam Fedor * TextConverters/RTF/GNUmakefile.preamble: Add BUNDLE_LIBS. diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index 5c356c1f7..8a68ad259 100644 --- a/Resources/GNUmakefile +++ b/Resources/GNUmakefile @@ -27,7 +27,10 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make RESOURCE_SET_NAME = gui-resources +# Defined twice, one for old gnustep-makes, one for new ones. In the long +# run, keep only the new xxx_INSTALL_DIR one. gui-resources_RESOURCE_FILES_INSTALL_DIR = Library/Libraries/Resources/gnustep-gui +gui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/Resources/gnustep-gui gui-resources_LANGUAGES = English Italian Lojban Esperanto German gui-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 1e0759b15..66b336f03 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -411,7 +411,10 @@ HEADERS_INSTALL = ${APPKIT_HEADERS} \ # Resources RESOURCE_SET_NAME = libgui-resources +# Defined twice, one for old gnustep-makes, one for new ones. In the long +# run, keep only the new xxx_INSTALL_DIR one. libgui-resources_RESOURCE_FILES_INSTALL_DIR = Library/Libraries/Resources/gnustep-gui +libgui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/Resources/gnustep-gui libgui-resources_RESOURCE_DIRS = libgui-resources_RESOURCE_FILES = Info-gnustep.plist