diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-02 10:17:46 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-02 10:17:46 +0000 |
commit | 25a7785a3099b60289ee01f593aad2b988f0dfae (patch) | |
tree | c0402b71513013d21925508b36c80b44941a174a | |
parent | 2ffbbe6fc9788eeccb077c0d025c6b92fbbc527c (diff) |
- (bal) Makefile fix to use $(MAKE) instead of 'make' for platforms
that use 'gmake'. Patch by Tim Rice <tim@multitalents.net>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20010102 | 1 | 20010102 |
2 | - (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen | 2 | - (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen |
3 | <vinschen@redhat.com> | 3 | <vinschen@redhat.com> |
4 | - (bal) Makefile fix to use $(MAKE) instead of 'make' for platforms | ||
5 | that use 'gmake'. Patch by Tim Rice <tim@multitalents.net> | ||
4 | 6 | ||
5 | 20010101 | 7 | 20010101 |
6 | - (bal) Minor fix to Makefile to stop rebuilding executables if no | 8 | - (bal) Minor fix to Makefile to stop rebuilding executables if no |
diff --git a/Makefile.in b/Makefile.in index 7880ab5e1..52009f22f 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -79,7 +79,7 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h | |||
79 | 79 | ||
80 | LIBCOMPAT=openbsd-compat/libopenbsd-compat.a | 80 | LIBCOMPAT=openbsd-compat/libopenbsd-compat.a |
81 | $(LIBCOMPAT): | 81 | $(LIBCOMPAT): |
82 | (cd `dirname $@`; make) | 82 | (cd `dirname $@`; $(MAKE)) |
83 | 83 | ||
84 | libssh.a: $(LIBSSH_OBJS) | 84 | libssh.a: $(LIBSSH_OBJS) |
85 | $(AR) rv $@ $(LIBSSH_OBJS) | 85 | $(AR) rv $@ $(LIBSSH_OBJS) |
@@ -117,12 +117,12 @@ $(MANPAGES) $(CONFIGFILES):: | |||
117 | $(FIXPATHSCMD) $(srcdir)/$@ | 117 | $(FIXPATHSCMD) $(srcdir)/$@ |
118 | 118 | ||
119 | clean: | 119 | clean: |
120 | (cd openbsd-compat; make clean) | 120 | (cd openbsd-compat; $(MAKE) clean) |
121 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 121 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
122 | rm -f *.out core | 122 | rm -f *.out core |
123 | 123 | ||
124 | distclean: clean | 124 | distclean: clean |
125 | (cd openbsd-compat; make distclean) | 125 | (cd openbsd-compat; $(MAKE) distclean) |
126 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 126 | rm -f Makefile config.h config.status ssh_prng_cmds *~ |
127 | 127 | ||
128 | mrproper: distclean | 128 | mrproper: distclean |