configure.ac (includedir): Rename to ...

2004-05-25  Andrew Pinski  <pinskia@physics.uc.edu>

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

From-SVN: r82273

4 files changed, 14 insertions, 9 deletions

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 5bc5650..b64433a 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	* configure.ac (includedir): Rename to ...
+	(includedirname).
+	* Makefile.in: s/includedir/includedirname/.
+
 	PR target/11572
 	* configure.ac (includedir): Set to "include"
 	except for Darwin.
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 5658baa..f9a5685 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -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:
diff --git a/libobjc/configure b/libobjc/configure
index 7c83ae3..555e1e0 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1572,12 +1572,12 @@ esac
 
 # 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
@@ -5627,6 +5627,7 @@ s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
 s,@gcc_version@,$gcc_version,;t t
 s,@toolexecdir@,$toolexecdir,;t t
 s,@toolexeclibdir@,$toolexeclibdir,;t t
+s,@includedirname@,$includedirname,;t t
 s,@libext@,$libext,;t t
 s,@CC@,$CC,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
diff --git a/libobjc/configure.ac b/libobjc/configure.ac
index 4f6ec14..16f9a02 100644
--- a/libobjc/configure.ac
+++ b/libobjc/configure.ac
@@ -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)
 
 # --------