Small fixes to improve portability.

diff --git a/Makefile.am b/Makefile.am
index bbfa0141e6253fb4e06d3202df18b47e7be13cbd..1c152cae8b35de4cf3e889c38034bf07668e42f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ ChangeLog:
        cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` tinc-$(VERSION).tar.gz; do\
+       for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
          rm -Rf "$$f"; \
        done
 

diff --git a/autogen.sh b/autogen.sh
index 186d1e30b33931bb3ab900ef1feb2f0d0f3e9358..21a0f4c1283cb6b560f0341dbbadfd58d09a0dda 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,10 @@
 
 DIE=0
 
-alias make=${MAKE:-`which gmake || which make`}
+if ${MAKE:-gmake} -q -C . autogen.sh 2> /dev/null
+then
+  alias make=${MAKE:-gmake}
+fi
 
 srcdir="`/bin/pwd`"