mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-07 06:10:28 +00:00
Code Issues Releases Wiki Activity

Makefile.am: Replace make with ${MAKE} (#270)

Browse Source 
Fixes warnings such as:
"warning: jobserver unavailable: using -j1. Add `+' to parent make rule."

Signed-off-by: Sam James (sam_c) <sam@cmpct.info>
This commit is contained in:
sam_c 2020-04-20 18:29:16 +01:00 committed by GitHub
parent c2c84a1d26
commit 1fc54ebef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -23,13 +23,13 @@ maintainer-clean-local:
rm -f config.log debian rm -f config.log debian
testsuite: testsuite:
cd src/testsuite && make check cd src/testsuite && ${MAKE} check
lint: lint:
cd src/ngircd && make lint cd src/ngircd && ${MAKE} lint
srcdoc: srcdoc:
cd doc && make srcdoc cd doc && ${MAKE} srcdoc
have-xcodebuild: have-xcodebuild:
@xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
@ -64,7 +64,7 @@ osxpkg: have-packagemaker osxpkg-dest
--out ../../$(distdir).mpkg --out ../../$(distdir).mpkg
rm -f $(distdir).mpkg.zip rm -f $(distdir).mpkg.zip
zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
make osxpkg-clean ${MAKE} osxpkg-clean
osxpkg-clean: osxpkg-clean:
[ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
@ -72,12 +72,12 @@ osxpkg-clean:
osxpkg-dest: have-xcodebuild osxpkg-clean clean osxpkg-dest: have-xcodebuild osxpkg-clean clean
./configure --prefix=/opt/ngircd ./configure --prefix=/opt/ngircd
make xcode ${MAKE} xcode
make -C contrib/MacOSX de.barton.ngircd.plist ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist
mkdir -p ngircd.dest/opt/ngircd/sbin mkdir -p ngircd.dest/opt/ngircd/sbin
DESTDIR="$$PWD/ngircd.dest" make -C doc install DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install
DESTDIR="$$PWD/ngircd.dest" make -C contrib install DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install
DESTDIR="$$PWD/ngircd.dest" make -C man install DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install
cp contrib/MacOSX/build/Default/ngIRCd \ cp contrib/MacOSX/build/Default/ngIRCd \
ngircd.dest/opt/ngircd/sbin/ngircd ngircd.dest/opt/ngircd/sbin/ngircd
rm ngircd.dest/opt/ngircd/etc/ngircd.conf rm ngircd.dest/opt/ngircd/etc/ngircd.conf

6
doc/Makefile.am
View File

@ -55,7 +55,7 @@ all: $(generated_docs)
install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
$(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir) $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
@if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
make install-config; \ ${MAKE} install-config; \
fi fi
$(MKDIR_P) -m 755 $(DESTDIR)$(docdir) $(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
for f in $(static_docs) $(toplevel_docs); do \ for f in $(static_docs) $(toplevel_docs); do \
@ -75,7 +75,7 @@ install-config:
uninstall-hook: uninstall-hook:
rm -rf $(DESTDIR)$(docdir) rm -rf $(DESTDIR)$(docdir)
@if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \
make uninstall-config; \ ${MAKE} uninstall-config; \
else \ else \
echo; \ echo; \
echo " ** NOTE: Not uninstalling changed configuration file:"; \ echo " ** NOTE: Not uninstalling changed configuration file:"; \
@ -87,7 +87,7 @@ uninstall-config:
rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
srcdoc: srcdoc:
make -C src srcdoc ${MAKE} -C src srcdoc
.PHONY: install-config uninstall-config srcdoc .PHONY: install-config uninstall-config srcdoc