diff options
| author | Damien Miller <djm@mindrot.org> | 1999-12-26 12:26:21 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-12-26 12:26:21 +1100 |
| commit | 3688440c4d6b0493823d50f4d46659ecb2121b83 (patch) | |
| tree | 754fbe832d7158f0c59c5d74e892a8d017a59845 /Makefile.in | |
| parent | 32b3cf2c96fd8cee6cb082821a43d3375c850d58 (diff) | |
- Revised RPM package to include Jim Knoble's <jmknoble@pobox.com>
X11 ssh-askpass program.
- Revised RPM package to use conditional building of gnome and X11
askpass packages.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index fa9a9d81..a13c5519 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,8 @@ mandir=@mandir@ sysconfdir=@sysconfdir@ SSH_PROGRAM=@bindir@/ssh -ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass +ASKPASS_LOCATION=@libexecdir@/ssh +ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass CC=@CC@ PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" @@ -107,7 +108,7 @@ install: all if [ ! -z "@GNOME_ASKPASS@" ] ; then \ $(INSTALL) -d $(libexecdir) ; \ $(INSTALL) -d $(libexecdir)/ssh ; \ - $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_PROGRAM} ; \ + $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_LOCATION} ; \ fi if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ |