diff options
| author | Didier Raboud <odyx@debian.org> | 2016-08-09 18:11:49 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-09-02 08:51:51 +0200 |
| commit | 4ae7f022cbd6bf3ce0db078ad847c13f876de1d5 (patch) | |
| tree | cbf4be2426e7313cc7f790f367a4e503436ea502 | |
| parent | e592e92ab6c05bb920898e5371c6ef246ae67e18 (diff) | |
Use dpkg-architecture in cups-config to make it architecture-independant
Also filter -L/usr/lib/(triplet) out of LDFLAGS.
Also strip unnecessary libs from --libs.
Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch
| -rwxr-xr-x | cups-config.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cups-config.in b/cups-config.in index 9dd094d16..b073a074a 100755 --- a/cups-config.in +++ b/cups-config.in @@ -17,7 +17,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ includedir=@includedir@ -libdir=@libdir@ +libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) datarootdir=@datadir@ datadir=@datadir@ sysconfdir=@sysconfdir@ @@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@ # flags for compiler and linker... CFLAGS="" LDFLAGS="@EXPORT_LDFLAGS@" -LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@" +LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs` +LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@" # Check for local invocation... selfdir=`dirname $0` @@ -43,7 +44,7 @@ else CFLAGS="$CFLAGS -I$includedir" fi - if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then + if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then LDFLAGS="$LDFLAGS -L$libdir" fi fi |