diff --git a/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch b/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch index a085c0174..59235accd 100644 --- a/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch +++ b/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure -index d47cef7..2930e3a 100755 +index d47cef7..9d6fcbe 100755 --- a/configure +++ b/configure @@ -1,9 +1,11 @@ @@ -882,7 +882,7 @@ index d47cef7..2930e3a 100755 + prefix="`finddir B_COMMON_DIRECTORY`"; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, prefix defaults to \`finddir B_COMMON_DIRECTORY\`" >&5 +$as_echo "On $host_os systems, prefix defaults to \`finddir B_COMMON_DIRECTORY\`" >&6; } -+ if test "$sbindir" = '${prefix}/sbin' ; then ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...and sbindir defaults to \`finddir B_COMMON_DIRECTORY\`/bin" >&5 +$as_echo "...and sbindir defaults to \`finddir B_COMMON_DIRECTORY\`/bin" >&6; } + mandir="`finddir B_COMMON_DIRECTORY`/bin" @@ -984,7 +984,7 @@ index d47cef7..2930e3a 100755 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.in b/configure.in -index 0b96b8d..cb1d0a2 100644 +index 0b96b8d..cece319 100644 --- a/configure.in +++ b/configure.in @@ -96,7 +96,10 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead])) @@ -1067,7 +1067,7 @@ index 0b96b8d..cb1d0a2 100644 + if test "$prefix" = NONE ; then + prefix="`finddir B_COMMON_DIRECTORY`"; + AC_MSG_RESULT([On $host_os systems, prefix defaults to `finddir B_COMMON_DIRECTORY`]) -+ if test "$sbindir" = '${prefix}/sbin' ; then ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then + AC_MSG_RESULT([...and sbindir defaults to `finddir B_COMMON_DIRECTORY`/bin]) + mandir="`finddir B_COMMON_DIRECTORY`/bin" + fi