From 1fc54ebef1e511c7a512f01e05dea064b2f0e0b9 Mon Sep 17 00:00:00 2001 From: sam_c <11667869+thesamesam@users.noreply.github.com> Date: Mon, 20 Apr 2020 18:29:16 +0100 Subject: Makefile.am: Replace make with ${MAKE} (#270) Fixes warnings such as: "warning: jobserver unavailable: using -j1. Add `+' to parent make rule." Signed-off-by: Sam James (sam_c) --- Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5ac537f6..ec9c4447 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,13 +23,13 @@ maintainer-clean-local: rm -f config.log debian testsuite: - cd src/testsuite && make check + cd src/testsuite && ${MAKE} check lint: - cd src/ngircd && make lint + cd src/ngircd && ${MAKE} lint srcdoc: - cd doc && make srcdoc + cd doc && ${MAKE} srcdoc have-xcodebuild: @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ @@ -64,7 +64,7 @@ osxpkg: have-packagemaker osxpkg-dest --out ../../$(distdir).mpkg rm -f $(distdir).mpkg.zip zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg - make osxpkg-clean + ${MAKE} osxpkg-clean osxpkg-clean: [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest @@ -72,12 +72,12 @@ osxpkg-clean: osxpkg-dest: have-xcodebuild osxpkg-clean clean ./configure --prefix=/opt/ngircd - make xcode - make -C contrib/MacOSX de.barton.ngircd.plist + ${MAKE} xcode + ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist mkdir -p ngircd.dest/opt/ngircd/sbin - DESTDIR="$$PWD/ngircd.dest" make -C doc install - DESTDIR="$$PWD/ngircd.dest" make -C contrib install - DESTDIR="$$PWD/ngircd.dest" make -C man install + DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install + DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install + DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install cp contrib/MacOSX/build/Default/ngIRCd \ ngircd.dest/opt/ngircd/sbin/ngircd rm ngircd.dest/opt/ngircd/etc/ngircd.conf -- cgit 1.4.1