summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a4ea90a82..07ecba3fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120010102 120010102
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
520010101 720010101
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
80LIBCOMPAT=openbsd-compat/libopenbsd-compat.a 80LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
81$(LIBCOMPAT): 81$(LIBCOMPAT):
82 (cd `dirname $@`; make) 82 (cd `dirname $@`; $(MAKE))
83 83
84libssh.a: $(LIBSSH_OBJS) 84libssh.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
119clean: 119clean:
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
124distclean: clean 124distclean: 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
128mrproper: distclean 128mrproper: distclean