--- gcc/objc/Makefile	2018/04/24 18:20:07	1.1.1.4
+++ gcc/objc/Makefile	2018/04/24 18:26:40	1.1.1.5
@@ -1,5 +1,5 @@
 #  GNU Objective C Runtime Makefile
-#  Copyright (C) 1993 Free Software Foundation, Inc.
+#  Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 #
 #  This file is part of GNU CC.
 #
@@ -14,7 +14,8 @@
 #
 #  You should have received a copy of the GNU General Public License along with
 #  GNU CC; see the file COPYING.  If not, write to the Free Software
-#  Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#  Foundation, 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
 
 #  This makefile is run by the parent dir's makefile.
 #  thisdir1=`pwd`; \
@@ -26,6 +27,8 @@
 #    GCC_CFLAGS="$(GCC_CFLAGS)" incinstalldir=$$thisdir1/include
 #  Two targets are used by ../Makefile: `all' and `mostlyclean'.
 
+SHELL=/bin/sh
+
 .SUFFIXES: .m
 
 OPTIMIZE= -O
@@ -53,25 +56,25 @@ all:
 	cd ..; $(MAKE) sublibobjc.a
 
 OBJC_O = hash.o sarray.o class.o sendmsg.o init.o archive.o encoding.o \
-         selector.o objects.o misc.o Object.o Protocol.o
+         selector.o objects.o misc.o NXConstStr.o Object.o Protocol.o
 
 libobjc.a: $(OBJC_O)
 	-rm -f libobjc.a
-	$(AR) rc libobjc.a $(OBJC_O)
+	$(AR) rc libobjc.a $?
 # ranlib is run in the parent directory's makefile.
 
 OBJC_H = hash.h list.h sarray.h objc.h \
          objc-api.h \
-	 Object.h Protocol.h encoding.h typedstream.h
+	 NXConstStr.h Object.h Protocol.h encoding.h typedstream.h
 
 # copy objc headers to installation include directory
 copy-headers: 
 	-rm -fr $(incinstalldir)/objc
 	-mkdir $(incinstalldir)/objc
 	for file in $(OBJC_H); do \
-	  realfile=$(srcdir)/objc/$$file; \
-	  cp $$realfile $(incinstalldir)/objc; \
-	  chmod a+r $(incinstalldir)/objc/$$file; \
+	  realfile=$(srcdir)/objc/$${file}; \
+	  cp $${realfile} $(incinstalldir)/objc; \
+	  chmod a+r $(incinstalldir)/objc/$${file}; \
 	done
 
 mostlyclean:
@@ -92,5 +95,6 @@ encoding.o: encoding.c
 selector.o: selector.c
 objects.o: objects.c
 misc.o: misc.c
+NXConstStr.o: NXConstStr.m
 Object.o: Object.m
 Protocol.o: Protocol.m