diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-02-17 13:49:06 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-02-17 13:49:06 +0000 |
commit | 81e0232b13db827c0e0c43c142d41ea6f1150f28 (patch) | |
tree | c47eb0c4fdbc054b34188e8f3e7243c9cf6e3172 | |
parent | Update from Ralf Corsepius: (diff) | |
download | rtems-81e0232b13db827c0e0c43c142d41ea6f1150f28.tar.bz2 |
Update from Ralf Corsepius:
6) The macro files from aclocal/*.m4 contain the buggy sed-rules formerly
contained in aclocal..m4, i.e. the sed/sort-bug fix to aclocal.m4 didn't
make it to aclocal/*.m4. I think I should feel guilty for that - Obviously I
submitted the contents of an old aclocal-directory last time. - Sorry.
-rw-r--r-- | aclocal/check-files-in.m4 | 6 | ||||
-rw-r--r-- | aclocal/check-makefile.m4 | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/aclocal/check-files-in.m4 b/aclocal/check-files-in.m4 index f5e5556df1..cad0cf457e 100644 --- a/aclocal/check-files-in.m4 +++ b/aclocal/check-files-in.m4 @@ -3,14 +3,14 @@ dnl $Id$ dnl RTEMS_CHECK_FILES_IN(path,file,var) dnl path .. path relative to srcdir, where to start searching for files dnl file .. name of the files to search for -dnl var .. shell variable to append found files +dnl var .. shell variable to append files found AC_DEFUN(RTEMS_CHECK_FILES_IN, [ -AC_MSG_CHECKING(for $2 in $1) +AC_MSG_CHECKING(for $2.in in $1) if test -d $srcdir/$1; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find $1 -name $2 -print | sed 's%\.in%%' | sort`; + rtems_av_tmp=`find $1 -name "$2.in" -print | sed "s/$2\.in/%/" | sort | sed "s/%/$2/"` $3="$$3 $rtems_av_tmp"; cd $rtems_av_save_dir; AC_MSG_RESULT(done) diff --git a/aclocal/check-makefile.m4 b/aclocal/check-makefile.m4 index 07286d6318..6cb61f36b0 100644 --- a/aclocal/check-makefile.m4 +++ b/aclocal/check-makefile.m4 @@ -6,6 +6,5 @@ dnl at path and append an entry for Makefile to global variable dnl "makefiles" (from configure.in) for each Makefile.in found dnl AC_DEFUN(RTEMS_CHECK_MAKEFILE, -[RTEMS_CHECK_FILES_IN($1,Makefile.in,makefiles) +[RTEMS_CHECK_FILES_IN($1,Makefile,makefiles) ]) - |