summaryrefslogtreecommitdiff
path: root/contrib/Makefile
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-05-19 15:24:37 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-05-19 15:24:37 +1000
commit593538911a4d27f11f8d56e32abe141223c25916 (patch)
treee9829422d781fa2e27a9912f751d48d07411c662 /contrib/Makefile
parentd0494fdb29bfe47dc211291f77191f25941add77 (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/Makefile')
-rw-r--r--contrib/Makefile6
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 @@
1PKG_CONFIG = pkg-config
2
1all: 3all:
2 @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" 4 @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
3 5
@@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
7 `gnome-config --libs gnome gnomeui` 9 `gnome-config --libs gnome gnomeui`
8 10
9gnome-ssh-askpass2: gnome-ssh-askpass2.c 11gnome-ssh-askpass2: gnome-ssh-askpass2.c
10 $(CC) `pkg-config --cflags gtk+-2.0` \ 12 $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
11 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ 13 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
12 `pkg-config --libs gtk+-2.0 x11` 14 `$(PKG_CONFIG) --libs gtk+-2.0 x11`
13 15
14clean: 16clean:
15 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass 17 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass