From 1a40a9e06bf52f16f24aa0cd6987e780dd433a60 Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 10 Oct 1999 02:56:49 +0000
Subject: [PATCH] Move headers, more GMAppkit fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4984 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                   | 8 ++++++++
 Model/GMAppKit.m            | 2 +-
 Model/GNUmakefile           | 2 +-
 Source/GNUmakefile          | 2 +-
 Source/GNUmakefile.preamble | 4 +---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b5664412..5ddc9a6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-09    <fedor@gnu.org>
+
+	* Model/GMAppKit.m ([NSPopUpButton -initWithModelUnarchiver:]): 
+	decode itemArray as an array.
+
+	* Source/GNUmakefile: Move installed headers to gnustep/AppKit
+	* Model/GNUmakefile: Likewise.
+
 1999-10-08    <fedor@gnu.org>
 
 	* Model/GMAppKit.m ([NSPopUpButton -encodeWithModelArchiver:]):
diff --git a/Model/GMAppKit.m b/Model/GMAppKit.m
index 84de1a7d0..6935b3f87 100644
--- a/Model/GMAppKit.m
+++ b/Model/GMAppKit.m
@@ -847,7 +847,7 @@ void __dummy_GMAppKit_functionForLinking() {}
 
   int i, count;
   NSMutableArray* decodedItems
-      = [unarchiver decodeObjectWithName:@"itemArray"];
+      = [unarchiver decodeArrayWithName:@"itemArray"];
 
   self = [super initWithModelUnarchiver:unarchiver];
 
diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index d81400673..0f75ef670 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -40,7 +40,7 @@ endif
 libgmodel_OBJC_FILES = IMCustomObject.m IMConnectors.m IMLoading.m GMAppKit.m \
 	GMArchiver.m
 libgmodel_HEADER_FILES_DIR = ../Headers/AppKit
-libgmodel_HEADER_FILES_INSTALL_DIR = /gnustep/gui/AppKit
+libgmodel_HEADER_FILES_INSTALL_DIR = /gnustep/AppKit
 libgmodel_HEADER_FILES = IMConnectors.h IMCustomObject.h IMLoading.h \
 	GMAppKit.h GMArchiver.h
 
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 2b536f302..7b76e4664 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -142,7 +142,7 @@ libgnustep-gui_OBJC_FILES += NSPasteboard.m
 endif
 
 libgnustep-gui_HEADER_FILES_DIR = ../Headers
-libgnustep-gui_HEADER_FILES_INSTALL_DIR = /gnustep/gui
+libgnustep-gui_HEADER_FILES_INSTALL_DIR = /gnustep
 
 libgnustep-gui_HEADER_FILES = \
 AppKit/AppKit.h \
diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble
index 667f17579..7cb9cb5ba 100644
--- a/Source/GNUmakefile.preamble
+++ b/Source/GNUmakefile.preamble
@@ -73,9 +73,7 @@ ADDITIONAL_LIB_DIRS =
 #
 
 # Additional directories to be created during installation
-ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep \
-   $(GNUSTEP_HEADERS)/gnustep/gui \
-   $(GNUSTEP_HEADERS)/gnustep/gui/AppKit
+ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/AppKit
 
 # What are the libraries this library depends upon. This is needed for some
 # systems where building a shared library requires to pass to the linker