5 files changed, 16 insertions, 48 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 0b57b89a77..1c83920aad 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,5 +1,14 @@
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* 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.
+
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* configure.ac: Require automake >= 1.8, autoconf >= 2.59.
 
 2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
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])])
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index 7132985a3e..8ce22634c4 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -100,7 +100,7 @@ ${ARCH}/%.o: %.S $(ARCH)/$(dirstamp)
 	${CCASCOMPILE} -DASM -o $@ -c $<
 
 ${ARCH}/$(dirstamp):
-	@$(mkinstalldirs) $(ARCH)
+	@$(mkdir_p) $(ARCH)
 	@: > $(ARCH)/$(dirstamp)
 
 # Dependency files for use by gmake
diff --git a/c/src/automake/lib.am b/c/src/automake/lib.am
index 9a5aa21c71..637694c84f 100644
--- a/c/src/automake/lib.am
+++ b/c/src/automake/lib.am
@@ -9,16 +9,10 @@ RANLIB = @RANLIB@
 ARFLAGS = ruv
 
 define make-library
-test -d $(ARCH) || mkdir $(ARCH)
+@$(mkdir_p) $(ARCH)
 $(RM) $@
 $(AR) $(ARFLAGS) $@ $^
 $(RANLIB) $@
 endef
 
-$(PROJECT_RELEASE)/lib/$(dirstamp):
-	@$(mkinstalldirs) $@
-	@: > $(PROJECT_RELEASE)/lib/$(dirstamp)
-
-TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib
-
-.PRECIOUS: $(LIB)
+TMPINSTALL_FILES =