From 14348a0058ebd473a1b75dd8a6219413c74b53bf Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 12 Dec 2003 12:36:19 +0000 Subject: 2003-12-12 Ralf Corsepius * aclocal/lead-dot.m4: Remove (Provided by automake-1.8). * automake/compile.am: Use mkdir_p instead of mkinstalldirs. * automake/lib.am: Use mkdir_p instead of mkdir. Remove $(PROJECT_RELEASE)/lib/$(dirstamp) handling. * aclocal/env-rtemsbsp.m4: Remove bsplibdir. Cleanups. --- c/src/aclocal/env-rtemsbsp.m4 | 11 ++++------- c/src/aclocal/lead-dot.m4 | 32 -------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 c/src/aclocal/lead-dot.m4 (limited to 'c/src/aclocal') diff --git a/c/src/aclocal/env-rtemsbsp.m4 b/c/src/aclocal/env-rtemsbsp.m4 index 1dc9f78b1e..7b61f5702c 100644 --- a/c/src/aclocal/env-rtemsbsp.m4 +++ b/c/src/aclocal/env-rtemsbsp.m4 @@ -33,12 +33,6 @@ AC_SUBST(RTEMS_BSP_SPECS) GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/" AC_SUBST(GCC_SPECS) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - -PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP" -AC_SUBST(PROJECT_RELEASE) - RTEMS_ROOT="\$(PROJECT_ROOT)/c/$RTEMS_BSP" AC_SUBST(RTEMS_ROOT) @@ -51,6 +45,9 @@ AM_CONDITIONAL([MULTILIB],[false]) includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" libdir="\${exec_prefix}/${RTEMS_BSP}/lib" -AC_SUBST([bsplibdir],["\${exec_prefix}/${RTEMS_BSP}/lib"]) +AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"]) +AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"]) + AC_SUBST([project_libdir],["\$(libdir)"]) +AC_SUBST([project_includedir],["\$(includedir)"]) ]) diff --git a/c/src/aclocal/lead-dot.m4 b/c/src/aclocal/lead-dot.m4 deleted file mode 100644 index c8789fb2ce..0000000000 --- a/c/src/aclocal/lead-dot.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) -- cgit v1.2.3