From 6f6ea15b1e8db08a4008abff64a287ee5ac327a8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 2 Apr 2012 11:19:33 +0100 Subject: * Fix cross-building: - Allow using a cross-architecture pkg-config. - Pass default LDFLAGS to contrib/Makefile. - Allow dh_strip to strip gnome-ssh-askpass, rather than calling 'install -s'. --- contrib/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/Makefile b/contrib/Makefile index 8b34eb221..c6c48e78a 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,3 +1,5 @@ +PKG_CONFIG = pkg-config + all: @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" @@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c `gnome-config --libs gnome gnomeui` gnome-ssh-askpass2: gnome-ssh-askpass2.c - $(CC) `pkg-config --cflags gtk+-2.0` \ + $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ - `pkg-config --libs gtk+-2.0 x11` + `$(PKG_CONFIG) --libs gtk+-2.0 x11` clean: rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass -- cgit v1.2.3