diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-02-26 10:12:38 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-02-26 10:12:38 +1100 |
commit | dc8fc621036147ff43f3fb1e8a1aa0d8026e5208 (patch) | |
tree | 50e459269ade54251f497bddc43a91afc239bf70 | |
parent | 3804903a094f41d09e8b294dbd69a846dcf7fe94 (diff) |
- (dtucker) [Makefile.in] Add a install-nosysconf target for installing the
binaries without the config files. Primarily useful for packaging.
Patch from phil at usc.edu. ok djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 9 |
2 files changed, 10 insertions, 4 deletions
@@ -4,6 +4,9 @@ | |||
4 | - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}] | 4 | - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}] |
5 | Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any | 5 | Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any |
6 | more. Patch from vinschen at redhat.com. | 6 | more. Patch from vinschen at redhat.com. |
7 | - (dtucker) [Makefile.in] Add a install-nosysconf target for installing the | ||
8 | binaries without the config files. Primarily useful for packaging. | ||
9 | Patch from phil at usc.edu. ok djm@ | ||
7 | 10 | ||
8 | 20050224 | 11 | 20050224 |
9 | - (djm) [configure.ac] in_addr_t test needs sys/types.h too | 12 | - (djm) [configure.ac] in_addr_t test needs sys/types.h too |
@@ -2170,4 +2173,4 @@ | |||
2170 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2173 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2171 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2174 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2172 | 2175 | ||
2173 | $Id: ChangeLog,v 1.3665 2005/02/25 23:07:37 dtucker Exp $ | 2176 | $Id: ChangeLog,v 1.3666 2005/02/25 23:12:38 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 71036c118..bca425d36 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.269 2005/02/20 10:01:49 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.270 2005/02/25 23:12:38 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -230,8 +230,9 @@ distprep: catman-do | |||
230 | -rm -rf autom4te.cache | 230 | -rm -rf autom4te.cache |
231 | (cd scard && $(MAKE) -f Makefile.in distprep) | 231 | (cd scard && $(MAKE) -f Makefile.in distprep) |
232 | 232 | ||
233 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config | 233 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
234 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files | 234 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf |
235 | install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files | ||
235 | 236 | ||
236 | check-config: | 237 | check-config: |
237 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 238 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
@@ -281,6 +282,8 @@ install-files: scard-install | |||
281 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 282 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
282 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 283 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
283 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 284 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
285 | |||
286 | install-sysconf: | ||
284 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 287 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
285 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | 288 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ |
286 | fi | 289 | fi |