summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-02 10:17:46 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-02 10:17:46 +0000
commit25a7785a3099b60289ee01f593aad2b988f0dfae (patch)
treec0402b71513013d21925508b36c80b44941a174a
parent2ffbbe6fc9788eeccb077c0d025c6b92fbbc527c (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--ChangeLog2
-rw-r--r--Makefile.in6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a4ea90a8..07ecba3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
20010102
- (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen
<vinschen@redhat.com>
+ - (bal) Makefile fix to use $(MAKE) instead of 'make' for platforms
+ that use 'gmake'. Patch by Tim Rice <tim@multitalents.net>
20010101
- (bal) Minor fix to Makefile to stop rebuilding executables if no
diff --git a/Makefile.in b/Makefile.in
index 7880ab5e..52009f22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h
LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
$(LIBCOMPAT):
- (cd `dirname $@`; make)
+ (cd `dirname $@`; $(MAKE))
libssh.a: $(LIBSSH_OBJS)
$(AR) rv $@ $(LIBSSH_OBJS)
@@ -117,12 +117,12 @@ $(MANPAGES) $(CONFIGFILES)::
$(FIXPATHSCMD) $(srcdir)/$@
clean:
- (cd openbsd-compat; make clean)
+ (cd openbsd-compat; $(MAKE) clean)
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
distclean: clean
- (cd openbsd-compat; make distclean)
+ (cd openbsd-compat; $(MAKE) distclean)
rm -f Makefile config.h config.status ssh_prng_cmds *~
mrproper: distclean