diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2007-05-02 15:01:37 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2007-05-02 15:01:37 +0000 |
| commit | ba562f87b9dfda309139487c66ebd32a44e5db93 (patch) | |
| tree | a6e9e29da3f832f5d5438eece10f929262110d75 | |
| parent | 2559710cacaa162bd46acdec2a45ce76a930575a (diff) | |
STR #1632: replaced 'install -d' with 'mkdir -p', falling back to 'install' in case 'mkdir' could not be found (which I can't imagine happening. Now I hope that every implementation of 'mkdir' supports the '-p' flag.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5797 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | makeinclude.in | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 26aa58b3a..df0755cc6 100644 --- a/configure.in +++ b/configure.in @@ -278,6 +278,14 @@ if test "$INSTALL" = "$ac_install_sh"; then # Use full path to install-sh script... INSTALL="`pwd`/install-sh -c" fi +AC_PATH_PROG(MKDIRR,mkdir) +dnl recursive mkdir +if test "x$MKDIRR" = "x:"; then + # Use install instead + MKDIRR="$INSTALL -d" +else + MKDIRR="$MKDIRR -p" +fi AC_PATH_PROG(NROFF,nroff) if test "x$NROFF" = "x:"; then # Try groff instead of nroff... diff --git a/makeinclude.in b/makeinclude.in index 4bf800155..a318acbe1 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -40,6 +40,7 @@ VPATH = @srcdir@ # programs we use... HTMLDOC = @HTMLDOC@ INSTALL = @INSTALL@ +MKDIRR = @MKDIRR@ LN = ln -s NROFF = @NROFF@ RM = rm -f @@ -114,7 +115,7 @@ CAT6EXT = @CAT6EXT@ INSTALL_BIN = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_DIR = $(INSTALL) -d +INSTALL_DIR = $(MKDIRR) -v INSTALL_LIB = $(INSTALL) -m 755 INSTALL_MAN = $(INSTALL) -m 644 INSTALL_SCRIPT = $(INSTALL) -m 755 |