Tag
Hash :
2a8e1b17
Author :
Date :
2003-11-10T20:55:33
* automake.in (handle_configure): Distribute and define mkinstalldirs only if it is already present in the package. (scan_autoconf_files): Do not require mkinstalldirs. (require_build_directory): Use $(mkdir_p), not $(mkinstalldirs). * lib/am/data.am, lib/am/distdir.am, lib/am/install.am, lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/mans.am, lib/am/progs.am, lib/am/python.am, lib/am/scripts.am, lib/am/texinfos.am: Use $(mkdir_p) instead of $(mkinstalldirs). * m4/mkdirp.m4: New file. * m4/Makefile.am (dist_m4data_DATA): Add mkdirp.m4. * m4/init.m4 (AM_INIT_AUTOMAKE): Call AM_PROG_MKDIR_P. * tests/Makefile.am (TESTS): Remove insh.test. * tests/insh.test: Delete. * tests/defs.in, tests/instsh.test: Do not install mkinstalldirs. * tests/auxdir.test: Install mkinstalldirs. * tests/distdir.test, tests/instman.test, tests/pr2.test: Use $(mkdir_p), not $(mkinstalldirs). * tests/empty.test: Run configure, do not substitute things by hand. * doc/automake.texi (Optional) <AC_CONFIG_FILES>: Take install-sh as an example, not mkinstalldirs. (Auxiliary Programs) <mkinstalldirs>: Update.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
# 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.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
if mkdir -m 0755 -p -- . 2>/dev/null; then
mkdir_p='mkdir -m 0755 -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
for d in ./-m ./0755 ./-p ./--;
do
test -d $d && rmdir $d
done
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
if test -f "$am_aux_dir/mkinstalldirs"; then
mkdir_p='$(mkinstalldirs) -m 0755'
else
mkdir_p='$(install_sh) -m 0755 -d'
fi
fi
AC_SUBST([mkdir_p])])