4 files changed, 16 insertions, 13 deletions
diff --git a/source/d/pkg-config/doinst.sh b/source/d/pkg-config/doinst.sh
index c8adcd31..06ebcafc 100644
--- a/source/d/pkg-config/doinst.sh
+++ b/source/d/pkg-config/doinst.sh
@@ -1,6 +1,9 @@
-if [ ! -L usr/share/pkgconfig ]; then
-  mkdir -p usr/lib/pkgconfig 2> /dev/null
-  mv usr/share/pkgconfig/* usr/lib/pkgconfig 2> /dev/null
-  rmdir usr/share/pkgconfig 2> /dev/null
-  ( cd usr/share ; ln -sf ../lib/pkgconfig . 2> /dev/null )
+# Break the /usr/share/pkgconfig symlinks, if it exists.
+# Then move the .pc files to the standard location.
+if [ -L usr/share/pkgconfig ]; then
+  rm usr/share/pkgconfig
+  mkdir -p usr/share/pkgconfig
+  grep usr/share/pkgconfig var/log/packages/* | grep '\.pc$' | cut -f 2 -d : | cut -f 4 -d / | while read movefile ; do
+    mv usr/lib/pkgconfig/$movefile usr/share/pkgconfig 1> /dev/null 2> /dev/null
+  done
 fi
diff --git a/source/d/pkg-config/pkg-config.SlackBuild b/source/d/pkg-config/pkg-config.SlackBuild
index 0c42ef57..595e9759 100755
--- a/source/d/pkg-config/pkg-config.SlackBuild
+++ b/source/d/pkg-config/pkg-config.SlackBuild
@@ -22,12 +22,12 @@
 
 PKGNAM=pkg-config
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -42,8 +42,8 @@ PKG=$TMP/package-pkg-config
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
diff --git a/source/d/pkg-config/scripts/pkgconfig.csh b/source/d/pkg-config/scripts/pkgconfig.csh
index 477a93a7..da9a45a6 100755
--- a/source/d/pkg-config/scripts/pkgconfig.csh
+++ b/source/d/pkg-config/scripts/pkgconfig.csh
@@ -1,6 +1,6 @@
 #!/bin/csh
 if ( $?PKG_CONFIG_PATH ) then
-    setenv PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
+    setenv PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
 else
-    setenv PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+    setenv PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 endif
diff --git a/source/d/pkg-config/scripts/pkgconfig.sh b/source/d/pkg-config/scripts/pkgconfig.sh
index c3f35031..96e07c4f 100755
--- a/source/d/pkg-config/scripts/pkgconfig.sh
+++ b/source/d/pkg-config/scripts/pkgconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ ! "$PKG_CONFIG_PATH" = "" ]; then
-  PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
+  PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
 else
-  PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+  PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 fi
 export PKG_CONFIG_PATH