summaryrefslogtreecommitdiffstats
path: root/contrib/Makefile
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-05-19 15:25:03 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-05-19 15:25:03 +1000
commitf8eb9c95fc25066ac8ccf62b8f8d1f9f64babbda (patch)
tree54e0d17c414fe873414cda0850fc419ea0b29174 /contrib/Makefile
parent6d9e1decdb9d3b571c5c542220ed780dda0d03ef (diff)
- (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to findV_6_0
pkg-config so it does the right thing when cross-compiling. Patch from cjwatson at debian org.
Diffstat (limited to 'contrib/Makefile')
-rw-r--r--contrib/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 8b34eb22..c6c48e78 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