16 files changed, 10 insertions, 3 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 9d461a47886..8e0735d0dc9 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 30 09:14:52 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* All .h files pushed down into the objc/ subdirectory.
+	* Makefile.in (copy_headers): Corresponding changes.
+	* configure.in (AC_INIT): Corresponding changes.
+	* configure: Rebuilt.
+
 1998-09-30  Ben Elliston  <bje@cygnus.com>
 	    Jeff Law	  <law@cygnus.com>
 
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 201b86c4fc7..d8c7d14a2bf 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -261,7 +261,7 @@ copy-headers:
 	-rm -rf $(incinstalldir)/objc
 	-mkdir $(incinstalldir)/objc
 	for file in $(OBJC_H); do \
-	  realfile=$(srcdir)/$${file}; \
+	  realfile=$(srcdir)/objc/$${file}; \
 	  cp $${realfile} $(incinstalldir)/objc; \
 	  chmod a+r $(incinstalldir)/objc/$${file}; \
 	done
diff --git a/libobjc/configure b/libobjc/configure
index 1465d0e5431..9379887d6bd 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -454,7 +454,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=objc.h
+ac_unique_file=objc/objc.h
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
diff --git a/libobjc/configure.in b/libobjc/configure.in
index 45e49d2c3a1..8a5c58f04dd 100644
--- a/libobjc/configure.in
+++ b/libobjc/configure.in
@@ -19,7 +19,7 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
-AC_INIT(objc.h)
+AC_INIT(objc/objc.h)
 #AC_CONFIG_HEADER(config.h)
 
 if test "${srcdir}" = "." ; then
diff --git a/libobjc/NXConstStr.h b/libobjc/objc/NXConstStr.h
index c9799544a02..c9799544a02 100644
--- a/libobjc/NXConstStr.h
+++ b/libobjc/objc/NXConstStr.h
diff --git a/libobjc/Object.h b/libobjc/objc/Object.h
index a762acc3f7d..a762acc3f7d 100644
--- a/libobjc/Object.h
+++ b/libobjc/objc/Object.h
diff --git a/libobjc/Protocol.h b/libobjc/objc/Protocol.h
index c7464cf17a9..c7464cf17a9 100644
--- a/libobjc/Protocol.h
+++ b/libobjc/objc/Protocol.h
diff --git a/libobjc/encoding.h b/libobjc/objc/encoding.h
index cbbc8de7ef5..cbbc8de7ef5 100644
--- a/libobjc/encoding.h
+++ b/libobjc/objc/encoding.h
diff --git a/libobjc/hash.h b/libobjc/objc/hash.h
index bddb791c820..bddb791c820 100644
--- a/libobjc/hash.h
+++ b/libobjc/objc/hash.h
diff --git a/libobjc/objc-api.h b/libobjc/objc/objc-api.h
index fe34dafb895..fe34dafb895 100644
--- a/libobjc/objc-api.h
+++ b/libobjc/objc/objc-api.h
diff --git a/libobjc/objc-list.h b/libobjc/objc/objc-list.h
index 19760906238..19760906238 100644
--- a/libobjc/objc-list.h
+++ b/libobjc/objc/objc-list.h
diff --git a/libobjc/objc.h b/libobjc/objc/objc.h
index 79b2519e576..79b2519e576 100644
--- a/libobjc/objc.h
+++ b/libobjc/objc/objc.h
diff --git a/libobjc/runtime.h b/libobjc/objc/runtime.h
index b0eae4a222d..b0eae4a222d 100644
--- a/libobjc/runtime.h
+++ b/libobjc/objc/runtime.h
diff --git a/libobjc/sarray.h b/libobjc/objc/sarray.h
index 74fa38652ba..74fa38652ba 100644
--- a/libobjc/sarray.h
+++ b/libobjc/objc/sarray.h
diff --git a/libobjc/thr.h b/libobjc/objc/thr.h
index f904733695a..f904733695a 100644
--- a/libobjc/thr.h
+++ b/libobjc/objc/thr.h
diff --git a/libobjc/typedstream.h b/libobjc/objc/typedstream.h
index eb4642f344b..eb4642f344b 100644
--- a/libobjc/typedstream.h
+++ b/libobjc/objc/typedstream.h