summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--INSTALL4
-rw-r--r--Makefile.in108
-rw-r--r--packages/redhat/openssh.spec3
-rw-r--r--packages/suse/openssh.spec2
5 files changed, 62 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index 237533f1c..692a0ea99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
8 - New URL for x11-ssh-askpass. 8 - New URL for x11-ssh-askpass.
9 - Fixpaths was missing /etc/ssh_known_hosts. Report from Jim Knoble 9 - Fixpaths was missing /etc/ssh_known_hosts. Report from Jim Knoble
10 <jmknoble@pobox.com> 10 <jmknoble@pobox.com>
11 - Added 'DESTDIR' option to Makefile to ease package building. Patch from
12 Jim Knoble <jmknoble@pobox.com>
13 - Updated RPM spec files to use DESTDIR
11 14
1220000124 1520000124
13 - Pick up version 1.2.2 from OpenBSD CVS (no changes, just version number 16 - Pick up version 1.2.2 from OpenBSD CVS (no changes, just version number
diff --git a/INSTALL b/INSTALL
index 90bee1905..93fc2f2fb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,8 +27,8 @@ libraries and headers.
27GNOME: 27GNOME:
28http://www.gnome.org/ 28http://www.gnome.org/
29 29
30Alternatly Jim Knoble <jmknoble@pobox.com> has written an excellent X11 30Alternatively, Jim Knoble <jmknoble@pobox.com> has written an excellent X11
31passphrase requester. This is maintained seperatly at: 31passphrase requester. This is maintained separately at:
32 32
33http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html 33http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html
34 34
diff --git a/Makefile.in b/Makefile.in
index 964b10851..6f8793fae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,8 @@ piddir=@piddir@
10srcdir=@srcdir@ 10srcdir=@srcdir@
11top_srcdir=@top_srcdir@ 11top_srcdir=@top_srcdir@
12 12
13DESTDIR=
14
13VPATH=@srcdir@ 15VPATH=@srcdir@
14 16
15SSH_PROGRAM=@bindir@/ssh 17SSH_PROGRAM=@bindir@/ssh
@@ -100,65 +102,65 @@ catman-do:
100 done 102 done
101 103
102install: $(TARGETS) 104install: $(TARGETS)
103 $(INSTALL) -d $(bindir) 105 $(INSTALL) -d $(DESTDIR)$(bindir)
104 $(INSTALL) -d $(sbindir) 106 $(INSTALL) -d $(DESTDIR)$(sbindir)
105 $(INSTALL) -d $(mandir) 107 $(INSTALL) -d $(DESTDIR)$(mandir)
106 $(INSTALL) -d $(mandir)/$(mansubdir)1 108 $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)1
107 $(INSTALL) -d $(mandir)/$(mansubdir)8 109 $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8
108 $(INSTALL) -s ssh $(bindir)/ssh 110 $(INSTALL) -s ssh $(DESTDIR)$(bindir)/ssh
109 $(INSTALL) -s scp $(bindir)/scp 111 $(INSTALL) -s scp $(DESTDIR)$(bindir)/scp
110 $(INSTALL) -s ssh-add $(bindir)/ssh-add 112 $(INSTALL) -s ssh-add $(DESTDIR)$(bindir)/ssh-add
111 $(INSTALL) -s ssh-agent $(bindir)/ssh-agent 113 $(INSTALL) -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
112 $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen 114 $(INSTALL) -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
113 $(INSTALL) -s sshd $(sbindir)/sshd 115 $(INSTALL) -s sshd $(DESTDIR)$(sbindir)/sshd
114 $(INSTALL) -m 644 ssh.[01].out $(mandir)/$(mansubdir)1/ssh.1 116 $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
115 $(INSTALL) -m 644 scp.[01].out $(mandir)/$(mansubdir)1/scp.1 117 $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
116 $(INSTALL) -m 644 ssh-add.[01].out $(mandir)/$(mansubdir)1/ssh-add.1 118 $(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
117 $(INSTALL) -m 644 ssh-agent.[01].out $(mandir)/$(mansubdir)1/ssh-agent.1 119 $(INSTALL) -m 644 ssh-agent.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
118 $(INSTALL) -m 644 ssh-keygen.[01].out $(mandir)/$(mansubdir)1/ssh-keygen.1 120 $(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
119 $(INSTALL) -m 644 sshd.[08].out $(mandir)/$(mansubdir)8/sshd.8 121 $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
120 -rm -f $(bindir)/slogin 122 -rm -f $(DESTDIR)$(bindir)/slogin
121 ln -s ssh $(bindir)/slogin 123 ln -s ssh $(DESTDIR)$(bindir)/slogin
122 -rm -f $(mandir)/$(mansubdir)1/slogin.1 124 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
123 ln -s ssh.1 $(mandir)/$(mansubdir)1/slogin.1 125 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
124 126
125 if [ ! -z "@GNOME_ASKPASS@" ] ; then \ 127 if [ ! -z "@GNOME_ASKPASS@" ] ; then \
126 $(INSTALL) -d $(libexecdir) ; \ 128 $(INSTALL) -d $(DESTDIR)$(libexecdir) ; \
127 $(INSTALL) -d $(libexecdir)/ssh ; \ 129 $(INSTALL) -d $(DESTDIR)$(libexecdir)/ssh ; \
128 $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_LOCATION} ; \ 130 $(INSTALL) -s @GNOME_ASKPASS@ $(DESTDIR)${ASKPASS_LOCATION} ; \
129 fi 131 fi
130 132
131 if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ 133 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
132 $(INSTALL) -d $(sysconfdir); \ 134 $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
133 $(INSTALL) -m 644 ssh_config.out $(sysconfdir)/ssh_config; \ 135 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
134 $(INSTALL) -m 644 sshd_config.out $(sysconfdir)/sshd_config; \ 136 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
135 fi 137 fi
136 138
137uninstallall: uninstall 139uninstallall: uninstall
138 -rm -f $(sysconfdir)/ssh_config 140 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
139 -rm -f $(sysconfdir)/sshd_config 141 -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
140 -rmdir $(sysconfdir) 142 -rmdir $(DESTDIR)$(sysconfdir)
141 -rmdir $(bindir) 143 -rmdir $(DESTDIR)$(bindir)
142 -rmdir $(sbindir) 144 -rmdir $(DESTDIR)$(sbindir)
143 -rmdir $(mandir)/$(mansubdir)1 145 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
144 -rmdir $(mandir)/$(mansubdir)8 146 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8
145 -rmdir $(mandir) 147 -rmdir $(DESTDIR)$(mandir)
146 -rmdir $(libexecdir) 148 -rmdir $(DESTDIR)$(libexecdir)
147 149
148uninstall: 150uninstall:
149 -rm -f $(bindir)/ssh 151 -rm -f $(DESTDIR)$(bindir)/ssh
150 -rm -f $(bindir)/scp 152 -rm -f $(DESTDIR)$(bindir)/scp
151 -rm -f $(bindir)/ssh-add 153 -rm -f $(DESTDIR)$(bindir)/ssh-add
152 -rm -f $(bindir)/ssh-agent 154 -rm -f $(DESTDIR)$(bindir)/ssh-agent
153 -rm -f $(bindir)/ssh-keygen 155 -rm -f $(DESTDIR)$(bindir)/ssh-keygen
154 -rm -f $(sbindir)/sshd 156 -rm -f $(DESTDIR)$(sbindir)/sshd
155 -rm -f $(mandir)/$(mansubdir)1/ssh.1 157 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
156 -rm -f $(mandir)/$(mansubdir)1/scp.1 158 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
157 -rm -f $(mandir)/$(mansubdir)1/ssh-add.1 159 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
158 -rm -f $(mandir)/$(mansubdir)1/ssh-agent.1 160 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
159 -rm -f $(mandir)/$(mansubdir)1/ssh-keygen.1 161 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
160 -rm -f $(mandir)/$(mansubdir)8/sshd.8 162 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
161 -rm -f $(bindir)/slogin 163 -rm -f $(DESTDIR)$(bindir)/slogin
162 -rm -f $(mandir)/$(mansubdir)1/slogin.1 164 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
163 -rm -f ${ASKPASS_PROGRAM} 165 -rm -f $(DESTDIR)${ASKPASS_PROGRAM}
164 -rmdir $(libexecdir)/ssh ; 166 -rmdir $(DESTDIR)$(libexecdir)/ssh ;
diff --git a/packages/redhat/openssh.spec b/packages/redhat/openssh.spec
index ece13c5b7..d8c3cf3a6 100644
--- a/packages/redhat/openssh.spec
+++ b/packages/redhat/openssh.spec
@@ -160,9 +160,8 @@ cd ..
160 160
161%install 161%install
162rm -rf $RPM_BUILD_ROOT 162rm -rf $RPM_BUILD_ROOT
163make install prefix="$RPM_BUILD_ROOT/usr" sysconfdir="$RPM_BUILD_ROOT/etc/ssh" 163make install DESTDIR=$RPM_BUILD_ROOT/
164 164
165install -d $RPM_BUILD_ROOT/etc/ssh
166install -d $RPM_BUILD_ROOT/etc/pam.d/ 165install -d $RPM_BUILD_ROOT/etc/pam.d/
167install -d $RPM_BUILD_ROOT/etc/rc.d/init.d 166install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
168install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd 167install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
diff --git a/packages/suse/openssh.spec b/packages/suse/openssh.spec
index a2a5cd2a7..a43671765 100644
--- a/packages/suse/openssh.spec
+++ b/packages/suse/openssh.spec
@@ -150,7 +150,7 @@ make
150 150
151%install 151%install
152rm -rf $RPM_BUILD_ROOT 152rm -rf $RPM_BUILD_ROOT
153make install prefix="$RPM_BUILD_ROOT/usr" sysconfdir="$RPM_BUILD_ROOT/etc/ssh" 153make install DESTDIR=$RPM_BUILD_ROOT/
154install -d $RPM_BUILD_ROOT/etc/ssh/ 154install -d $RPM_BUILD_ROOT/etc/ssh/
155install -d $RPM_BUILD_ROOT/etc/pam.d/ 155install -d $RPM_BUILD_ROOT/etc/pam.d/
156install -d $RPM_BUILD_ROOT/sbin/init.d/ 156install -d $RPM_BUILD_ROOT/sbin/init.d/