[Gsrc-commit] /srv/bzr/gsrc/trunk r2387: improve external library searching

[Brandon Invergo]

------------------------------------------------------------
revno: 2387
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-20 12:48:22 +0200
message:
  improve external library searching
modified:
  gar.lib/external.mk

=== modified file 'gar.lib/external.mk'
--- a/gar.lib/external.mk       2013-04-25 15:03:10 +0000
+++ b/gar.lib/external.mk       2013-05-20 10:48:22 +0000
@@ -31,14 +31,15 @@
 
 
#################################################################################
 
-.BINPATTERNS ?= %
-.LIBPATTERNS ?= lib%.so lib%.a
-.PYPATTERNS ?= %.pyc %.py
-.PKGPATTERNS ?= %.pc
-.MANPATTERNS ?= $(foreach i,1 2 3 4 5 6 7 8,man$i/%.$i*)
+.BINPATTERNS = %
+.LIBPATTERNS = lib%.so* lib%.a
+.PYPATTERNS = %.pyc %.py
+.PKGPATTERNS = %.pc
+.MANPATTERNS = $(foreach i,1 2 3 4 5 6 7 8,man$i/%.$i*)
 
 # not all systems add the usual system directorys to LD_LIBRARY_PATH
-SYSLIBS = /lib:/usr/lib:/usr/local/lib
+GCC_MULTIARCH = $(shell gcc -print-multiarch)
+SYSLIBS = /lib:/usr/lib:/usr/local/lib$(if 
$(GCC_MULTIARCH),:/usr/lib/$(GCC_MULTIARCH))
 
 MISSING_BINFILES = $(call gar_missing,$(BINFILES),$(PATH), \
                        $(.BINPATTERNS))