summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-09-14 13:17:07 +0000
committerColin Watson <cjwatson@debian.org>2005-09-14 13:17:07 +0000
commit76eee7cb12c22d950044f3b6f2ca242ff37b965b (patch)
tree031cafece4c42f7feab1bb610e4c163f70fc59cd /debian
parent9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (diff)
* debian/rules: Resynchronise CFLAGS with that generated by configure.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b277b7435..1ee13f203 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
1openssh (1:4.2p1-1) UNRELEASED; urgency=low 1openssh (1:4.2p1-1) UNRELEASED; urgency=low
2 2
3 * New upstream release. 3 * New upstream release.
4 * debian/rules: Resynchronise CFLAGS with that generated by configure.
4 5
5 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 13:35:17 +0100 6 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 13:35:17 +0100
6 7
diff --git a/debian/rules b/debian/rules
index 80c1ea45e..63087d072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ endif
80 # Debian's /var/log/btmp has inappropriate permissions. 80 # Debian's /var/log/btmp has inappropriate permissions.
81 perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h 81 perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h
82 82
83 $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' 83 $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -std=gnu99 -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""'
84 # Support building on Debian 3.0 (with GNOME 1.4) and later. 84 # Support building on Debian 3.0 (with GNOME 1.4) and later.
85 if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \ 85 if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
86 $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'; \ 86 $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'; \
@@ -100,7 +100,7 @@ build-udeb-stamp:
100 # Avoid libnsl linkage. Ugh. 100 # Avoid libnsl linkage. Ugh.
101 perl -pi -e 's/ +-lnsl//' build-udeb/config.status 101 perl -pi -e 's/ +-lnsl//' build-udeb/config.status
102 cd build-udeb && ./config.status 102 cd build-udeb && ./config.status
103 $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' ssh scp sftp sshd ssh-keygen 103 $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -std=gnu99 -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' ssh scp sftp sshd ssh-keygen
104 touch build-udeb-stamp 104 touch build-udeb-stamp
105 105
106clean: 106clean: