diff options
author | des <des@FreeBSD.org> | 2016-02-07 11:38:54 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-02-07 11:38:54 +0000 |
commit | 5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0 (patch) | |
tree | 4db6899304517c45f13302b0b11d3144c257dada /crypto/openssh/contrib/Makefile | |
parent | c76cb9755e8e722ba04e0c26cf28ecc0adeb52de (diff) | |
download | FreeBSD-src-5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0.zip FreeBSD-src-5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0.tar.gz |
MFH (r265214, r294333, r294407, r294467): misc prop fixes
MFH (r285975, r287143): register mergeinfo for security fixes
MFH (r294497, r294498, r295139): internal documentation
MFH (r294328): upgrade to openssh 6.7p1, re-add libwrap
MFH (r294332): upgrade to openssh 6.8p1
MFH (r294367): update pam_ssh for api changes
MFH (r294909): switch usedns back on
MFH (r294336): upgrade to openssh 6.9p1
MFH (r294495): re-enable dsa keys
MFH (r294464): upgrade to openssh 7.0p1
MFH (r294496): upgrade to openssh 7.1p2
Approved by: re (gjb)
Relnotes: yes
Diffstat (limited to 'crypto/openssh/contrib/Makefile')
-rw-r--r-- | crypto/openssh/contrib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/contrib/Makefile b/crypto/openssh/contrib/Makefile index c6c48e7..eaf7fe2 100644 --- a/crypto/openssh/contrib/Makefile +++ b/crypto/openssh/contrib/Makefile @@ -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` |