* 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'.

1 files changed, 4 insertions, 2 deletions

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