folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace MKDIR_P and MKDIR with RPM_MKDIR_P and RPM_MKDIR to avoid conflicts with automake's build-in MKDIR_P/MKDIR

This commit is contained in:
Ralf Corsépius 2007-08-15 13:49:01 +02:00
parent 81aa846162
commit 81b1baab5a
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/files.c
View File

@ -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;

2
build/parsePrep.c
View File

@ -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);
}

22
configure.ac
View File

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