diff options
author | Damien Miller <djm@mindrot.org> | 2000-01-03 14:42:09 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-01-03 14:42:09 +1100 |
commit | 645c598d3c6c64f1f20de6fc43d4484033417b4d (patch) | |
tree | 23b9a60e18ccb9d7831d1140d594fe1a334fb97f | |
parent | 8beab01b493d4b9c683a2a0c5da083c2e9dfd735 (diff) |
- Add explicit make rules for files proccessed by fixpaths.
- Fix "make install" in RPM spec files. Report from Tenkou N. Hattori
<tnh@kondara.org>
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 33 | ||||
-rw-r--r-- | packages/redhat/openssh.spec | 4 | ||||
-rw-r--r-- | packages/suse/openssh.spec | 4 |
4 files changed, 36 insertions, 11 deletions
@@ -1,9 +1,13 @@ +20000103 + - Add explicit make rules for files proccessed by fixpaths. + - Fix "make install" in RPM spec files. Report from Tenkou N. Hattori + <tnh@kondara.org> + 20000102 - Prevent multiple inclusion of config.h and defines.h. Suggested by Andre Lucas <andre.lucas@dial.pipex.com> - Properly clean up on exit of ssh-agent. Patch from Dean Gaudet <dgaudet@arctic.org> - - Run fixpaths before install. (Andre Lucas) 19991231 - Fix password support on systems with a mixture of shadowed and diff --git a/Makefile.in b/Makefile.in index 8c875a3c..d04d22de 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,11 @@ SSHDOBJS= sshd.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o \ auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o \ serverloop.o bsd-login.o md5crypt.o -all: $(OBJS) $(TARGETS) manpages +MANPAGES=scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 + +CONFIGFILES=sshd_config ssh_config + +all: $(OBJS) $(TARGETS) $(MANPAGES) $(CONFIGFILES) $(OBJS): config.h @@ -89,10 +93,31 @@ clean: rm -f *.o $(TARGETS) config.status config.cache config.log core \ *.1 *.8 sshd_config ssh_config -manpages: - $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.[18].in $(srcdir)/ssh*_config.in +scp.1: scp.1.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/scp.1.in + +ssh-add.1: ssh-add.1.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-add.1.in + +ssh-agent.1: ssh-agent.1.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-agent.1.in + +ssh-keygen.1: ssh-keygen.1.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-keygen.1.in + +ssh.1: ssh.1.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh.1.in + +sshd.8: sshd.8.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd.8.in + +sshd_config: sshd_config.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd_config.in + +ssh_config: ssh_config.in + $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh_config.in -install: manpages all +install: $(TARGETS) $(INSTALL) -d $(bindir) $(INSTALL) -d $(sbindir) $(INSTALL) -d $(mandir) diff --git a/packages/redhat/openssh.spec b/packages/redhat/openssh.spec index de26c467..96ac87bd 100644 --- a/packages/redhat/openssh.spec +++ b/packages/redhat/openssh.spec @@ -158,15 +158,13 @@ cd .. %install rm -rf $RPM_BUILD_ROOT -make install prefix="$RPM_BUILD_ROOT/usr" +make install prefix="$RPM_BUILD_ROOT/usr" sysconfdir="$RPM_BUILD_ROOT/etc/ssh" install -d $RPM_BUILD_ROOT/etc/ssh install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd -install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config -install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass diff --git a/packages/suse/openssh.spec b/packages/suse/openssh.spec index 6163a180..9fdcffe5 100644 --- a/packages/suse/openssh.spec +++ b/packages/suse/openssh.spec @@ -148,15 +148,13 @@ make %install rm -rf $RPM_BUILD_ROOT -make install prefix="$RPM_BUILD_ROOT/usr" +make install prefix="$RPM_BUILD_ROOT/usr" sysconfdir="$RPM_BUILD_ROOT/etc/ssh" install -d $RPM_BUILD_ROOT/etc/ssh/ install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/sbin/init.d/ install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd install -m744 packages/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd -install -m644 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config -install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass install -m744 packages/suse/rc.config.sshd \ |