From 6fdc10046efe3c2095154810b0dc4aac4656f014 Mon Sep 17 00:00:00 2001
From: Adam Fedor <fedor@gnu.org>
Date: Wed, 13 May 1998 20:56:38 +0000
Subject: [PATCH] Doc changes. Other minor fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2797 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog      | 7 +++++++
 GNUmakefile.in | 3 +++
 brain.make     | 2 +-
 target.make    | 8 +++++---
 tool.make      | 4 +++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47a4b30b..963fce4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed May 13 16:00:37 1998  Adam Fedor  <fedor@ultra.doc.com>
+
+	* GNUmakefile.in: Create GNUSTEP_LIB_COMBO directory.
+	* brain.make (GUI_LIBS): Include -lgnustep-gui twice.
+	* target.make (OPENSTEP 4.X): Fix libtool flags.
+	* tool.make (TOOL_INSTALLATION_DIR): Conditionally set this.
+
 Sun Apr  5 20:06:03 1998  Scott Christley  <scottc@net-community.com>
 
 	* documentation.make: Have html rule be based upon the table
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f1286a8c..699184fb 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -39,6 +39,7 @@ datadir = @datadir@
 
 GNUSTEP_TARGET_CPU := @target_cpu@
 GNUSTEP_TARGET_OS := @target_os@
+GNUSTEP_LIB_COMBO := @ac_cv_library_combo@
 
 GNUSTEP_TARGET_CPU := $(shell ./clean_cpu.sh $(GNUSTEP_TARGET_CPU))
 GNUSTEP_TARGET_VENDOR := $(shell ./clean_vendor.sh $(GNUSTEP_TARGET_VENDOR))
@@ -46,6 +47,7 @@ GNUSTEP_TARGET_OS := $(shell ./clean_os.sh $(GNUSTEP_TARGET_OS))
 
 makedir = $(prefix)/Makefiles
 tooldir = $(prefix)/Tools
+librarydir = $(prefix)/Libraries
 GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
 INSTALL		= @INSTALL@
@@ -65,6 +67,7 @@ install: all
 		$(prefix)/share \
 		$(prefix)/Apps \
 		$(prefix)/Libraries/$(GNUSTEP_TARGET_DIR) \
+		$(prefix)/Libraries/$(GNUSTEP_TARGET_DIR)/$(GNUSTEP_LIB_COMBO) \
 		$(prefix)/Headers/$(GNUSTEP_TARGET_DIR) \
 		$(prefix)/Tools/$(GNUSTEP_TARGET_DIR) \
 		$(prefix)/Library \
diff --git a/brain.make b/brain.make
index 7d1e0520..b96fccb1 100644
--- a/brain.make
+++ b/brain.make
@@ -125,7 +125,7 @@ GUI_LIBS =
 #
 ifeq ($(GUI_LIB),gnu)
 GUI_LDFLAGS =
-GUI_LIBS = -lgnustep-gui -lgmodel
+GUI_LIBS = -lgnustep-gui -lgmodel -lgnustep-gui
 GUI_DEFINE = -DGNU_GUI_LIBRARY=1
 endif
 
diff --git a/target.make b/target.make
index aadaf08c..13cdb37f 100644
--- a/target.make
+++ b/target.make
@@ -101,7 +101,8 @@ TARGET_LIB_DIR = \
 
 ifneq ($(OBJC_COMPILER), NeXT)
 SHARED_LIB_LINK_CMD     = \
-	/bin/libtool -dynamic -read_only_relocs suppress $(ARCH_FLAGS) -o $@ \
+	/bin/libtool -dynamic -read_only_relocs suppress $(ARCH_FLAGS) \
+		-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) -o $@ \
 		-framework System \
 		$(ALL_LIB_DIRS) \
 		$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
@@ -111,7 +112,7 @@ SHARED_LIB_LINK_CMD     = \
 else
 SHARED_LIB_LINK_CMD     = \
         /bin/libtool -dynamic -read_only_relocs suppress $(ARCH_FLAGS) \
-		$(ALL_LDFLAGS) $@ \
+		-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) $(ALL_LDFLAGS) $@ \
 		-framework System \
 		$(ALL_LIB_DIRS) $(LIBRARIES_DEPEND_UPON) \
 		$(LIBRARIES_FOUNDATION_DEPEND_UPON) $^; \
@@ -122,7 +123,8 @@ endif
 STATIC_LIB_LINK_CMD	= \
 	/bin/libtool -static $(ARCH_FLAGS) -o $@ $^
 
-ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
+# This doesn't work with 4.1, what about others?
+#ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
 
 AFTER_INSTALL_STATIC_LIB_COMMAND =
 
diff --git a/tool.make b/tool.make
index 8dd549df..45cd27ab 100644
--- a/tool.make
+++ b/tool.make
@@ -36,8 +36,10 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 
 # This is the directory where the tools get installed. If you don't specify a
 # directory they will get installed in the GNUstep system root.
-TOOL_INSTALLATION_DIR = \
+ifeq ($(TOOL_INSTALLATION_DIR),)
+  TOOL_INSTALLATION_DIR = \
     $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
+endif
 
 ifeq ($(INTERNAL_tool_NAME),)