Re: [PATCH] [committed] first step to get libobjc back and building and working on Darwin

[Andrew Pinski <pinskia at physics dot uc dot edu>]

On May 25, 2004, at 18:38, Andrew Pinski wrote:

> This is the first step to get back libobjc building, the GNU's libobjc
> is now called libobjc-gnu and the include directory is 
> include-gnu-runtime.
>
> Thanks,
> Andrew Pinski


And I messed up as includedir is used for the fullpath to the include 
directory
in the prefix, woops.
Here is the patch which fixes that and also fixes the include directory 
on Darwin.

ChangeLog:

	* configure.ac (includedir): Rename to ...
	(includedirname).
	* Makefile.in: s/includedir/includedirname/.


Patch:

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/Makefile.in,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.in
--- Makefile.in	25 May 2004 22:39:01 -0000	1.40
+++ Makefile.in	26 May 2004 01:19:07 -0000
@@ -40,7 +40,7 @@ toolexecdir = @toolexecdir@
 # Toolexecdir is used only by toolexeclibdir
 toolexeclibdir = @toolexeclibdir@

-includedir = @includedir@
+includedirname = @includedirname@
 libext = @libext@

 top_builddir = .
@@ -324,10 +324,10 @@ install-libs: installdirs

 # Copy Objective C headers to installation include directory.
 install-headers:
-	$(SHELL) $(toplevel_srcdir)/mkinstalldirs 
$(DESTDIR)$(libsubdir)/$(includedir)/objc
+	$(SHELL) $(toplevel_srcdir)/mkinstalldirs 
$(DESTDIR)$(libsubdir)/$(includedirname)/objc
 	for file in $(OBJC_H); do \
 	  realfile=$(srcdir)/objc/$${file}; \
-	  $(INSTALL_DATA) $${realfile} 
$(DESTDIR)$(libsubdir)/$(includedir)/objc; \
+	  $(INSTALL_DATA) $${realfile} 
$(DESTDIR)$(libsubdir)/$(includedirname)/objc; \
 	done

 check uninstall install-strip dist installcheck installdirs:
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/configure.ac,v
retrieving revision 1.5
diff -u -p -r1.5 configure.ac
--- configure.ac	25 May 2004 22:39:02 -0000	1.5
+++ configure.ac	26 May 2004 01:19:07 -0000
@@ -156,16 +156,16 @@ AC_SUBST(toolexeclibdir)

 # Figure out if we want to name the include directory and the
 #  library name changes differently.
-includedir=include
+includedirname=include
 libext=
 case "${host}" in
   *-darwin*)
     # Darwin is the only target so far that needs a different include 
directory.
-    includedir=gnu-runtime;
+    includedirname=include-gnu-runtime
     libext=-gnu
     ;;
 esac
-AC_SUBST(includedir)
+AC_SUBST(includedirname)
 AC_SUBST(libext)

 # --------