From c957b4250845dcb2bbb6a8daff270038c0b8f9ab Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 14 Dec 1998 06:17:12 +0000
Subject: [PATCH] Keep mframe.h in a machine/os specific directory

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3451 72102866-910b-0410-8b05-ffd578937521
---
 Source/GNUmakefile         |  2 +-
 Source/Makefile.postamble  | 11 +++++++++--
 Source/NSConnection.m      |  2 +-
 Source/NSInvocation.m      |  2 +-
 Source/NSMethodSignature.m |  2 +-
 Source/NSObjCRuntime.m     |  2 +-
 Source/NSSerializer.m      |  2 +-
 Source/mframe.m            |  2 +-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 6df6609b3..f24cbc8ce 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -233,7 +233,6 @@ UnixFileHandle.h \
 ValueHolding.h \
 behavior.h \
 fake-main.h \
-mframe.h \
 numbers.h \
 ostream.h \
 o_array.h \
@@ -492,6 +491,7 @@ include/o_array.h \
 include/o_hash.h \
 include/o_list.h \
 include/o_map.h \
+$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h \
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h
 
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index 7f9c805b5..fe31c4d7d 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -55,6 +55,8 @@ after-install::
 	done
 	$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h \
 	    $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \
+	    $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \
 	  if [ "`whoami`" != root ]; then \
 	    echo "WARNING: Please add the following lines yourself"; \
@@ -92,7 +94,7 @@ after-uninstall::
 # Things to do after distcleaning
 after-distclean::
 	rm -f include/config.h include/GSConfig.h include/dynamic-load.h \
-		Foundation gnustep/base \
+		include/mframe.h Foundation gnustep/base \
 		NSNumber[0-9]*.m NSValue[0-9]*.m o_*_bas.m
 	rmdir gnustep
 
@@ -186,6 +188,11 @@ $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h: ../config.status
 	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	-mv include/GSConfig.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
+$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h: ../config.status
+	$(GNUSTEP_MAKEFILES)/mkinstalldirs \
+	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	-mv include/mframe.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+
 include/o_%_bas.h: include/o_x_bas.h.in
 	sed -e "s/@XX@/$*/g" $< > $@
 
@@ -211,7 +218,7 @@ include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h
 #	Files that include mframe.h will need a rebuild if it is changed.
 #
 mframe.m NSConnection.m NSInvocation.m NSMethodSignature.m NSObjCRuntime.m \
-	: include/mframe.h
+	: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h
 	touch $@
 
 #
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index ff03943d7..acb427206 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -34,7 +34,7 @@
 #include <gnustep/base/preface.h>
 #include <Foundation/DistributedObjects.h>
 #include <gnustep/base/TcpPort.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <gnustep/base/NotificationDispatcher.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSRunLoop.h>
diff --git a/Source/NSInvocation.m b/Source/NSInvocation.m
index f0856fb1d..59649c933 100644
--- a/Source/NSInvocation.m
+++ b/Source/NSInvocation.m
@@ -26,7 +26,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSInvocation.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 @implementation NSInvocation
 
diff --git a/Source/NSMethodSignature.m b/Source/NSMethodSignature.m
index 438032d92..a6329f647 100644
--- a/Source/NSMethodSignature.m
+++ b/Source/NSMethodSignature.m
@@ -25,7 +25,7 @@
 
 #include <config.h>
 #include <gnustep/base/preface.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 #include <Foundation/NSMethodSignature.h>
 #include <Foundation/NSException.h>
diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m
index 51ebe08e4..62746fb64 100644
--- a/Source/NSObjCRuntime.m
+++ b/Source/NSObjCRuntime.m
@@ -26,7 +26,7 @@
 #include <gnustep/base/fast.x>
 #include <Foundation/NSObjCRuntime.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 NSString *
 NSStringFromSelector(SEL aSelector)
diff --git a/Source/NSSerializer.m b/Source/NSSerializer.m
index afeadeaef..66eeed615 100644
--- a/Source/NSSerializer.m
+++ b/Source/NSSerializer.m
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <gnustep/base/preface.h>
 #include <gnustep/base/fast.x>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSArray.h>
diff --git a/Source/mframe.m b/Source/mframe.m
index 76dd647cf..003bcb49a 100644
--- a/Source/mframe.m
+++ b/Source/mframe.m
@@ -30,7 +30,7 @@
 
 #include <config.h>
 #include <gnustep/base/preface.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSException.h>
 #include <stdlib.h>