X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile.am;h=ec9c4447c0b9cf61a826bbffd77fd278385de5de;hb=79a917f954bef8089967786bd3597a6e5ff5c336;hp=f6a97ce638e71e352c8e351ac88b3386ec14039e;hpb=114644cdb0a54804e4f68818235cc2d99b90322c;p=ngircd-alex.git

diff --git a/Makefile.am b/Makefile.am
index f6a97ce6..ec9c4447 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,15 +9,12 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = doc src man contrib
 
-EXTRA_DIST = autogen.sh configure.ng .mailmap
+EXTRA_DIST = README.md INSTALL.md autogen.sh configure.ng .clang_complete .mailmap
 
-clean-local:
+clean-local: osxpkg-clean
 	rm -f build-stamp*
-	rm -rf ngircd.dest
 
 maintainer-clean-local:
 	rm -rf autom4te.cache
@@ -26,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 \
@@ -62,28 +59,33 @@ deb:
 	dpkg-buildpackage -rfakeroot -i
 
 osxpkg: have-packagemaker osxpkg-dest
-	cd contrib/MacOSX && packagemaker \
+	cd contrib/MacOSX && packagemaker --no-recommend \
 	 --doc ngIRCd.pmdoc \
 	 --out ../../$(distdir).mpkg
 	rm -f $(distdir).mpkg.zip
 	zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
+	${MAKE} osxpkg-clean
+
+osxpkg-clean:
+	[ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
 	rm -rf ngircd.dest $(distdir).mpkg
 
-osxpkg-dest: have-xcodebuild 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
 	echo "Have a nice day IRCing!" >ngircd.dest/opt/ngircd/etc/ngircd.motd
 	chmod -R a-s,og-w,a+rX ngircd.dest
+	sudo chown -R root:wheel ngircd.dest
 
-.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-dest rpm \
-	srcdoc testsuite xcode xcode-clean
+.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-clean \
+	osxpkg-dest rpm srcdoc testsuite xcode xcode-clean
 
 # -eof-