Module: ngircd.git Branch: master Commit: 7f9bce705c72b7fc8ab597b67c0255a154b8b3bd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7f9bc...

Author: Alexander Barton alex@barton.de Date: Wed Mar 27 13:09:23 2013 +0100

Build OS X package with correct file permissions

This requires to have the correct permissions in the source tree, which is "root:wheel", which in turn requires root privileges. Therefore the Makefile now tries to become root on "make osxpkg-dest" but tries hard not to require root privileges on "clean" etc.

---

Makefile.am | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am index f6a97ce..0b797c1 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-2013 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 @@ -15,9 +15,8 @@ SUBDIRS = doc src man contrib

EXTRA_DIST = autogen.sh configure.ng .mailmap

-clean-local: +clean-local: osxpkg-clean rm -f build-stamp* - rm -rf ngircd.dest

maintainer-clean-local: rm -rf autom4te.cache @@ -62,14 +61,18 @@ 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: + [ ! -e 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 @@ -82,8 +85,9 @@ osxpkg-dest: have-xcodebuild clean 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-