[people/amarx/ipfire-3.x.git] / openssh / patches / openssh-6.1p1-askpass-ld.patch

diff -up openssh-6.1p1/contrib/Makefile.askpass-ld openssh-6.1p1/contrib/Makefile
--- openssh-6.1p1/contrib/Makefile.askpass-ld	2012-05-19 07:24:37.000000000 +0200
+++ openssh-6.1p1/contrib/Makefile	2012-09-14 20:35:47.565704718 +0200
@@ -4,12 +4,12 @@ all:
 	@echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
 
 gnome-ssh-askpass1: gnome-ssh-askpass1.c
-	$(CC) `gnome-config --cflags gnome gnomeui` \
+	$(CC) ${CFLAGS} `gnome-config --cflags gnome gnomeui` \
 		gnome-ssh-askpass1.c -o gnome-ssh-askpass1 \
 		`gnome-config --libs gnome gnomeui`
 
 gnome-ssh-askpass2: gnome-ssh-askpass2.c
-	$(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
+	$(CC) ${CFLAGS} `$(PKG_CONFIG) --cflags gtk+-2.0` \
 		gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
 		`$(PKG_CONFIG) --libs gtk+-2.0 x11`
Commit	Line	Data
43c69e28 SS	1	diff -up openssh-6.1p1/contrib/Makefile.askpass-ld openssh-6.1p1/contrib/Makefile
	2	--- openssh-6.1p1/contrib/Makefile.askpass-ld 2012-05-19 07:24:37.000000000 +0200
	3	+++ openssh-6.1p1/contrib/Makefile 2012-09-14 20:35:47.565704718 +0200
	4	@@ -4,12 +4,12 @@ all:
9d8fd3ad SS	5	@echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
	6
	7	gnome-ssh-askpass1: gnome-ssh-askpass1.c
	8	- $(CC) `gnome-config --cflags gnome gnomeui` \
	9	+ $(CC) ${CFLAGS} `gnome-config --cflags gnome gnomeui` \
	10	gnome-ssh-askpass1.c -o gnome-ssh-askpass1 \
	11	`gnome-config --libs gnome gnomeui`
	12
	13	gnome-ssh-askpass2: gnome-ssh-askpass2.c
43c69e28 SS	14	- $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
43c69e28 SS	15	+ $(CC) ${CFLAGS} `$(PKG_CONFIG) --cflags gtk+-2.0` \
9d8fd3ad	16	gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
43c69e28	17	`$(PKG_CONFIG) --libs gtk+-2.0 x11`
9d8fd3ad	18