From 7c62004549b71aedae448648c67f9100a1cb64f6 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 1 Oct 2001 20:16:57 +0000 Subject: [PATCH] Updated installation directory for changes in gnustep-make git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/libobjc/trunk@11069 72102866-910b-0410-8b05-ffd578937521 --- GNUmakefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4231e0e..f7f1ff6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,8 +30,14 @@ VERSION=1.0.1 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -# Make sure it doesn't get installed in library_combo dir -LIBRARY_INSTALL_DIR = $(GNUSTEP_TARGET_LIBRARIES) +ifeq ($(GNUSTEP_MAKE_MAJOR_VERSION),1) +# make sure we don't install into a library combo dir +ifeq ($(GNUSTEP_FLATTENED),) + LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR) +else + LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT) +endif +endif LIBRARY_NAME = libobjc