diff --git a/dev-libs/xapian/xapian-1.2.25.recipe b/dev-libs/xapian/xapian-1.2.25.recipe index fecffa799..44ad7334d 100644 --- a/dev-libs/xapian/xapian-1.2.25.recipe +++ b/dev-libs/xapian/xapian-1.2.25.recipe @@ -60,7 +60,7 @@ PROVIDES_devel=" REQUIRES_devel=" xapian$secondaryArchSuffix == $portVersion base " -if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$prefix"/bin ]; then +if [ -n "$secondaryArchSuffix" -a "$commandBinDir" = "$binDir" ]; then CONFLICTS_devel=" xapian_devel " @@ -101,7 +101,7 @@ INSTALL() rm -f "$libDir"/libxapian.la - if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then + if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then mkdir -p "$binDir" mv "$commandBinDir"/xapian-config "$binDir" fi @@ -119,7 +119,7 @@ INSTALL() "$developDir" \ "$dataDir" - if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then + if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then rmdir "$binDir" fi } diff --git a/dev-libs/xapian/xapian-1.4.5.recipe b/dev-libs/xapian/xapian-1.4.5.recipe index 7c19a9563..f8fffb7e5 100644 --- a/dev-libs/xapian/xapian-1.4.5.recipe +++ b/dev-libs/xapian/xapian-1.4.5.recipe @@ -58,7 +58,7 @@ PROVIDES_devel=" REQUIRES_devel=" xapian$secondaryArchSuffix == $portVersion base " -if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$prefix"/bin ]; then +if [ -n "$secondaryArchSuffix" -a "$commandBinDir" = "$binDir" ]; then CONFLICTS_devel=" xapian_devel " @@ -103,7 +103,7 @@ INSTALL() rm -f "$libDir"/libxapian.la - if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then + if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then mkdir -p "$binDir" mv "$commandBinDir"/xapian-config "$binDir" fi @@ -121,7 +121,7 @@ INSTALL() "$developDir" \ "$dataDir" - if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then + if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then rmdir "$binDir" fi }