2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/lead-dot.m4: Remove (Use the version in automake-1.8).
	* automake/lib.am: Remove $(project_libdir)$(MULTISUBDIR).
	* aclocal/env-rtemscpu.m4: Reflect new definition of project_lib.
	* Makefile.am: Remove BUILT_SOURCES.

cpukit/ChangeLog

@@ -1,3 +1,10 @@
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/lead-dot.m4: Remove (Use the version in automake-1.8).
+	* automake/lib.am: Remove $(project_libdir)$(MULTISUBDIR).
+	* aclocal/env-rtemscpu.m4: Reflect new definition of project_lib.
+	* Makefile.am: Remove BUILT_SOURCES.
+
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Require automake >= 1.8, autoconf >= 2.59.

cpukit/Makefile.am

@@ -23,8 +23,6 @@ include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \
     include/rtems/fs.h include/rtems/stdint.h
 
-BUILT_SOURCES = $(PREINSTALL_FILES)
-
 AUTOMAKE_FILES = automake/compile.am automake/lib.am automake/local.am \
     automake/multilib.am automake/subdirs.am
 EXTRA_DIST = $(AUTOMAKE_FILES)

cpukit/aclocal/env-rtemscpu.m4

@@ -14,9 +14,9 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
       [MULTISUBDIR="/$with_multisubdir"])
     AC_SUBST(MULTISUBDIR)
  
-    project_includedir="\$(PROJECT_ROOT)/include"
+    AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"])
-    project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
+    AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
- 
+
     includedir="\${exec_prefix}/include"
     libdir="${libdir}\$(MULTISUBDIR)"
   ],
@@ -39,22 +39,19 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
     AC_MSG_RESULT(${RTEMS_BSP})
     AC_SUBST(RTEMS_BSP)
  
-    project_includedir="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-    project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
-
     includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
     libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
 
+    AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"])
+    AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"])
+
     RTEMS_ENABLE_BARE
     AC_SUBST(BARE_CPU_MODEL)
     AC_SUBST(BARE_CPU_CFLAGS)
   ])
 
-  AC_SUBST(project_libdir)
+  AC_SUBST([project_libdir],["\$(libdir)"])
-  AC_SUBST(project_includedir)
+  AC_SUBST([project_includedir],["\$(includedir)"])
 
-  # FIXME: Deprecated, to be removed
-  AC_SUBST(PROJECT_INCLUDE,[$project_includedir])
- 
   AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
 ])

cpukit/aclocal/lead-dot.m4

@@ -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])])

cpukit/automake/lib.am

@@ -13,9 +13,4 @@ $(AR) $(ARFLAGS) $@ $^
 $(RANLIB) $@
 endef
 
-$(project_libdir)$(MULTISUBDIR):
+TMPINSTALL_FILES =
-	@$(mkinstalldirs) $@
-
-TMPINSTALL_FILES = $(project_libdir)$(MULTISUBDIR)
-
-.PRECIOUS: $(LIB)