Skip to content

Commit 4401799

Browse files
committed
0.6.4 (20100612)
- Added more debug statements - Fixed typographical errors in documentation - Fixed bug: need double-fork on Linux (spotted by Joey Hess joeyh at debian.org) - Updated makefiles to work with recent versions of GNU make - Updated to avoid new warnings in recent versions of gcc - Fixed pidfile race condition (with Hilko Bengen bengen at hilluzination.de) - Fixed bug in message for --verbose --running when --pidfile[s] also used - Don't strip if $DEB_BUILD_OPTIONS contains nostrip (for Julien Danjou acid at debian.org) - Made --running work when readonly (spotted by Thomas Koch thomas at koch.ro) - Stopped modifying --user argument so ps output looks right (for Hilko Bengen) - Made --user use ":" (but still accept ".") (for Lars Wirzenius lars at catalyst.net.nz) - Ported to GNU/kFreeBSD (with Cyril Brulebois cyril.brulebois at enst-bretagne.fr) - Added --idiot option (for Andras Korn korn-debbugs at chardonnay.math.bme.hu) - Added example/daemon.initd script (inspired by Javier Fernández-Sanguino Peña jfs at computer.org) - Ported to NetBSD - Added make nbsd nbsd-daemon nbsd-slack (netbsd binary packages) - Ported to Solaris10 and OpenSolaris - Tested on ubuntu-10.04, debian-5.0.4, fedora-13 (x86_64, i386) - Tested on solaris-10-200910, opensolaris-200906 (amd64, i386) - Tested on openbsd-4.7, freebsd-8.0, netbsd-5.0.2 (amd64, i386) - Tested on macosx-10.{4,5,6} (x86_64, i386, ppc) - Tested on kfreebsd-20090729 (i386) - Updated make rpm sol obsd fbsd osx to continue working
1 parent 8fee614 commit 4401799

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3927
-1490
lines changed

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# daemon - http://libslack.org/daemon/
33
#
4-
# Copyright (C) 1999-2004 raf <raf@raf.org>
4+
# Copyright (C) 1999-2010 raf <raf@raf.org>
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
1919
# or visit http://www.gnu.org/copyleft/gpl.html
2020
#
2121

22-
# 20040806 raf <raf@raf.org>
22+
# 20100612 raf <raf@raf.org>
2323

2424
CC := gcc
2525
# CC := cc
@@ -33,7 +33,13 @@ DESTDIR :=
3333
PREFIX := $(DESTDIR)/usr/local
3434
APP_INSDIR := $(PREFIX)/bin
3535
LIB_INSDIR := $(PREFIX)/lib
36-
MAN_INSDIR := $(PREFIX)/man
36+
MAN_SYSDIR := $(PREFIX)/share/man
37+
MAN_LOCDIR := $(PREFIX)/share/man
38+
ifeq ($(PREFIX),/usr)
39+
MAN_INSDIR := $(MAN_SYSDIR)
40+
else
41+
MAN_INSDIR := $(MAN_LOCDIR)
42+
endif
3743
HDR_INSDIR := $(PREFIX)/include
3844
DATA_INSDIR := $(PREFIX)/share
3945
CONF_INSDIR := /etc
@@ -60,7 +66,7 @@ DAEMON_INCDIRS := libslack
6066
DAEMON_LIBDIRS := libslack
6167
include $(DAEMON_SRCDIR)/macros.mk
6268

63-
.PHONY: all ready test check man html install uninstall dist rpm deb sol obsd fbsd osx
69+
.PHONY: all ready test check man html install uninstall dist rpm deb sol obsd fbsd nbsd osx
6470

6571
all: ready $(ALL_TARGETS)
6672
ready: $(READY_TARGETS)
@@ -75,6 +81,7 @@ deb: $(DEB_TARGETS)
7581
sol: $(SOL_TARGETS)
7682
obsd: $(OBSD_TARGETS)
7783
fbsd: $(FBSD_TARGETS)
84+
nbsd: $(NBSD_TARGETS)
7885
osx: $(OSX_TARGETS)
7986

8087
.PHONY: help help-macros depend clean clobber distclean
@@ -103,6 +110,7 @@ help::
103110
echo " sol -- makes binary solaris package"; \
104111
echo " obsd -- makes binary openbsd package"; \
105112
echo " fbsd -- makes binary freebsd package"; \
113+
echo " nbsd -- makes binary netbsd package"; \
106114
echo " osx -- makes binary macosx package"; \
107115
echo
108116

@@ -141,6 +149,7 @@ help-macros::
141149
echo "SOL_TARGETS = $(SOL_TARGETS)"; \
142150
echo "OBSD_TARGETS = $(OBSD_TARGETS)"; \
143151
echo "FBSD_TARGETS = $(FBSD_TARGETS)"; \
152+
echo "NBSD_TARGETS = $(NBSD_TARGETS)"; \
144153
echo "OSX_TARGETS = $(OSX_TARGETS)"; \
145154
echo
146155

0 commit comments

Comments
 (0)