diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 786cd4368..580065c03 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -5,15 +5,15 @@ sbindir=@sbindir@ | |||
5 | libexecdir=@libexecdir@ | 5 | libexecdir=@libexecdir@ |
6 | mandir=@mandir@ | 6 | mandir=@mandir@ |
7 | sysconfdir=@sysconfdir@ | 7 | sysconfdir=@sysconfdir@ |
8 | piddir=@piddir@ | ||
9 | srcdir=@srcdir@ | ||
10 | top_srcdir=@top_srcdir@ | ||
8 | 11 | ||
9 | srcdir = @srcdir@ | ||
10 | top_srcdir = @top_srcdir@ | ||
11 | VPATH=@srcdir@ | 12 | VPATH=@srcdir@ |
12 | 13 | ||
13 | SSH_PROGRAM=@bindir@/ssh | 14 | SSH_PROGRAM=@bindir@/ssh |
14 | ASKPASS_LOCATION=@libexecdir@/ssh | 15 | ASKPASS_LOCATION=@libexecdir@/ssh |
15 | ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass | 16 | ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass |
16 | FIXPATHS=@top_srcdir@/fixpaths | ||
17 | 17 | ||
18 | CC=@CC@ | 18 | CC=@CC@ |
19 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" | 19 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" |
@@ -24,6 +24,7 @@ AR=@AR@ | |||
24 | RANLIB=@RANLIB@ | 24 | RANLIB=@RANLIB@ |
25 | INSTALL=@INSTALL@ | 25 | INSTALL=@INSTALL@ |
26 | PERL=@PERL@ | 26 | PERL=@PERL@ |
27 | FIXPATHS=$(PERL) @top_srcdir@/fixpaths -Dsysconfdir=${sysconfdir} -Dpiddir=${piddir} | ||
27 | LDFLAGS=-L. @LDFLAGS@ | 28 | LDFLAGS=-L. @LDFLAGS@ |
28 | 29 | ||
29 | GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` | 30 | GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` |
@@ -73,28 +74,28 @@ gnome-ssh-askpass: gnome-ssh-askpass.c | |||
73 | $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS) | 74 | $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS) |
74 | 75 | ||
75 | scp.1: scp.1.in | 76 | scp.1: scp.1.in |
76 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/scp.1.in | 77 | $(FIXPATHS) $(srcdir)/scp.1.in |
77 | 78 | ||
78 | ssh-add.1: ssh-add.1.in | 79 | ssh-add.1: ssh-add.1.in |
79 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-add.1.in | 80 | $(FIXPATHS) ssh-add.1.in |
80 | 81 | ||
81 | ssh-agent.1: ssh-agent.1.in | 82 | ssh-agent.1: ssh-agent.1.in |
82 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-agent.1.in | 83 | $(FIXPATHS) ssh-agent.1.in |
83 | 84 | ||
84 | ssh-keygen.1: ssh-keygen.1.in | 85 | ssh-keygen.1: ssh-keygen.1.in |
85 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-keygen.1.in | 86 | $(FIXPATHS) ssh-keygen.1.in |
86 | 87 | ||
87 | ssh.1: ssh.1.in | 88 | ssh.1: ssh.1.in |
88 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh.1.in | 89 | $(FIXPATHS) ssh.1.in |
89 | 90 | ||
90 | sshd.8: sshd.8.in | 91 | sshd.8: sshd.8.in |
91 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd.8.in | 92 | $(FIXPATHS) sshd.8.in |
92 | 93 | ||
93 | sshd_config: sshd_config.in | 94 | sshd_config: sshd_config.in |
94 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd_config.in | 95 | $(FIXPATHS) sshd_config.in |
95 | 96 | ||
96 | ssh_config: ssh_config.in | 97 | ssh_config: ssh_config.in |
97 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh_config.in | 98 | $(FIXPATHS) ssh_config.in |
98 | 99 | ||
99 | clean: | 100 | clean: |
100 | rm -f *.o *.a $(TARGETS) config.status config.cache config.log | 101 | rm -f *.o *.a $(TARGETS) config.status config.cache config.log |
@@ -172,3 +173,7 @@ uninstall: | |||
172 | -rm -f ${ASKPASS_PROGRAM} | 173 | -rm -f ${ASKPASS_PROGRAM} |
173 | -rmdir $(libexecdir)/ssh ; | 174 | -rmdir $(libexecdir)/ssh ; |
174 | 175 | ||
176 | preformat: | ||
177 | -rm -f catman | ||
178 | -mkdir catman | ||
179 | for x in $(MANPAGES) ; do man ./$${x}.in > catman/$${x}.in ; done | ||