diff options
| author | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-15 13:49:01 +0200 |
|---|---|---|
| committer | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-15 13:49:01 +0200 |
| commit | 81b1baab5a842a7b9a753defdc6c796f662de3c5 (patch) | |
| tree | aa712ccb2c0dd8d1183551be95b0aee620524ecd | |
| parent | 81aa8461627668493e6392782fc4e9ee37fea5b7 (diff) | |
| download | rpm-81b1baab5a842a7b9a753defdc6c796f662de3c5.tar.gz rpm-81b1baab5a842a7b9a753defdc6c796f662de3c5.tar.bz2 rpm-81b1baab5a842a7b9a753defdc6c796f662de3c5.zip | |
Replace MKDIR_P and MKDIR with RPM_MKDIR_P and RPM_MKDIR to avoid conflicts with automake's build-in MKDIR_P/MKDIR
| -rw-r--r-- | build/files.c | 2 | ||||
| -rw-r--r-- | build/parsePrep.c | 2 | ||||
| -rw-r--r-- | configure.ac | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/build/files.c b/build/files.c index 1528c642e..c3ff036ca 100644 --- a/build/files.c +++ b/build/files.c @@ -1035,7 +1035,7 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf, appendLineStringBuf(pkg->specialDoc, buf); appendLineStringBuf(pkg->specialDoc, "export DOCDIR"); appendLineStringBuf(pkg->specialDoc, "rm -rf $DOCDIR"); - appendLineStringBuf(pkg->specialDoc, MKDIR_P " $DOCDIR"); + appendLineStringBuf(pkg->specialDoc, RPM_MKDIR_P " $DOCDIR"); /*@-temptrans@*/ *fileName = buf; diff --git a/build/parsePrep.c b/build/parsePrep.c index 12c3ff3c1..770e2a1c7 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -387,7 +387,7 @@ static int doSetupMacro(Spec spec, char *line) /* if necessary, create and cd into the proper dir */ if (createDir) { - sprintf(buf, MKDIR_P " %s\ncd %s", + sprintf(buf, RPM_MKDIR_P " %s\ncd %s", spec->buildSubdir, spec->buildSubdir); appendLineStringBuf(spec->prep, buf); } diff --git a/configure.ac b/configure.ac index 2133a8301..4ef8edbcf 100644 --- a/configure.ac +++ b/configure.ac @@ -158,41 +158,41 @@ AC_SUBST(FIXPERMS) dnl dnl see if we have a mkdir that supports `-p'. dnl -AC_PATH_PROGS(MKDIR, mkdir, mkdir) -AC_MSG_CHECKING(if $MKDIR supports -p) +AC_PATH_PROGS(RPM_MKDIR, mkdir, mkdir) +AC_MSG_CHECKING(if $RPM_MKDIR supports -p) rm -rf conftest -$MKDIR -p conftest/a 2>/dev/null +$RPM_MKDIR -p conftest/a 2>/dev/null if test $? = 0 ; then rmdir conftest/a 2>/dev/null if test $? = 0 ; then : else - MKDIR_P=0 + RPM_MKDIR_P=0 fi rmdir conftest 2>/dev/null if test $? = 0 ; then - MKDIR_P="$MKDIR -p" + RPM_MKDIR_P="$RPM_MKDIR -p" else - MKDIR_P=0 + RPM_MKDIR_P=0 fi else - MKDIR_P=0 + RPM_MKDIR_P=0 fi -if test X"$MKDIR_P" = X0 ; then +if test X"$RPM_MKDIR_P" = X0 ; then AC_MSG_RESULT(no) - MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`" + RPM_MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`" else AC_MSG_RESULT(yes) fi dnl dnl substitute this into config.h, so the C source picks it up. dnl -AC_DEFINE_UNQUOTED(MKDIR_P, "${MKDIR_P}", +AC_DEFINE_UNQUOTED(RPM_MKDIR_P, "${RPM_MKDIR_P}", [A full path to a program, possibly with arguments, that will create a directory and all necessary parent directories, ala 'mkdir -p']) -AC_SUBST(MKDIR_P) +AC_SUBST(RPM_MKDIR_P) AC_ISC_POSIX |