OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Pinski 2004-05-26 01:21:46 +00:00 committed by Andrew Pinski
parent de29c8bc56
commit 7d34a5a986
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobjc/ChangeLog
View File

@ -1,5 +1,9 @@
2004-05-25 Andrew Pinski <pinskia@physics.uc.edu> 2004-05-25 Andrew Pinski <pinskia@physics.uc.edu>
* configure.ac (includedir): Rename to ...
(includedirname).
* Makefile.in: s/includedir/includedirname/.
PR target/11572 PR target/11572
* configure.ac (includedir): Set to "include" * configure.ac (includedir): Set to "include"
except for Darwin. except for Darwin.

6
libobjc/Makefile.in
View File

@ -40,7 +40,7 @@ toolexecdir = @toolexecdir@
# Toolexecdir is used only by toolexeclibdir # Toolexecdir is used only by toolexeclibdir
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
includedir = @includedir@ includedirname = @includedirname@
libext = @libext@ libext = @libext@
top_builddir = . top_builddir = .
@ -324,10 +324,10 @@ install-libs: installdirs
# Copy Objective C headers to installation include directory. # Copy Objective C headers to installation include directory.
install-headers: install-headers:
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedir)/objc $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedirname)/objc
for file in $(OBJC_H); do \ for file in $(OBJC_H); do \
realfile=$(srcdir)/objc/$${file}; \ realfile=$(srcdir)/objc/$${file}; \
$(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedir)/objc; \ $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc; \
done done
check uninstall install-strip dist installcheck installdirs: check uninstall install-strip dist installcheck installdirs:

7
libobjc/configure vendored
View File

@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #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='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1572,12 +1572,12 @@ esac
# Figure out if we want to name the include directory and the # Figure out if we want to name the include directory and the
# library name changes differently. # library name changes differently.
includedir=include includedirname=include
libext= libext=
case "${host}" in case "${host}" in
*-darwin*) *-darwin*)
# Darwin is the only target so far that needs a different include directory. # Darwin is the only target so far that needs a different include directory.
includedir=gnu-runtime; includedirname=include-gnu-runtime
libext=-gnu libext=-gnu
;; ;;
esac esac
@ -5627,6 +5627,7 @@ s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
s,@gcc_version@,$gcc_version,;t t s,@gcc_version@,$gcc_version,;t t
s,@toolexecdir@,$toolexecdir,;t t s,@toolexecdir@,$toolexecdir,;t t
s,@toolexeclibdir@,$toolexeclibdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t
s,@includedirname@,$includedirname,;t t
s,@libext@,$libext,;t t s,@libext@,$libext,;t t
s,@CC@,$CC,;t t s,@CC@,$CC,;t t
s,@ac_ct_CC@,$ac_ct_CC,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t

6
libobjc/configure.ac
View File

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