diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 15:24:37 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 15:24:37 +1000 |
commit | 593538911a4d27f11f8d56e32abe141223c25916 (patch) | |
tree | e9829422d781fa2e27a9912f751d48d07411c662 /contrib | |
parent | d0494fdb29bfe47dc211291f77191f25941add77 (diff) |
- (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find
pkg-config so it does the right thing when cross-compiling. Patch from
cjwatson at debian org.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile | 6 |
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 |