--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,9 @@
+pkgconfig (0.15.0-4multiarch1) multiarch; urgency=low
+
+  * Multiarchify
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 16 Feb 2005 13:40:10 +0100
+
 pkgconfig (0.15.0-4) unstable; urgency=low
 
   * New Maintainer.

--- orig/debian/rules
+++ mod/debian/rules
@@ -9,7 +9,7 @@
 export DH_COMPAT=4
 
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -DSYSTEM_SEARCH_PATH="\"/usr/local/lib/pkgconfig:/usr/lib/$(DEB_BUILD_GNU_TYPE)/pkgconfig\""
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -35,8 +35,8 @@
 
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info --disable-shared \
-		$(confflags) CFLAGS="$(CFLAGS)" 
-	$(MAKE)
+		$(confflags) CFLAGS='$(CFLAGS)'
+	$(MAKE) 
 
 	touch build-stamp
 


--- orig/pkg.c
+++ mod/pkg.c
@@ -51,6 +51,10 @@
 #define PKGLIBDIR g_strconcat (g_win32_get_package_installation_directory (PACKAGE, NULL), "\\lib\\pkgconfig", NULL)
 #endif
 
+#ifndef SYSTEM_SEARCH_PATH
+#define SYSTEM_SEARCH_PATH ""
+#endif
+
 static void verify_package (Package *pkg);
 
 static GHashTable *packages = NULL;
@@ -188,11 +192,24 @@
 {
   static gboolean initted = FALSE;
   const char *pkglibdir;
+  char **system_search_dirs;
+  char **iter;
 
   pkglibdir = g_getenv ("PKG_CONFIG_LIBDIR");
   if (pkglibdir == NULL)
     pkglibdir = PKGLIBDIR;
 
+  system_search_dirs = g_strsplit (SYSTEM_SEARCH_PATH, G_SEARCHPATH_SEPARATOR_S, -1);
+  iter = system_search_dirs;
+  while (*iter)
+    {
+      debug_spew ("Adding directory '%s' from default system search path\n",
+                  *iter);
+      add_search_dir (*iter);
+      ++iter;
+    }
+  g_strfreev (system_search_dirs);
+
   if (!initted)
     {
       initted = TRUE;
@@ -202,9 +219,7 @@
       path_positions = g_hash_table_new (g_str_hash, g_str_equal);
       
       g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
-#ifdef DEBIAN
-      scan_dir ("/usr/local/lib/pkgconfig");
-#endif
+
       scan_dir (pkglibdir);
     }
 }