Changeset 1343

Show
Ignore:
Timestamp:
06/10/07 22:28:45 (4 years ago)
Author:
jo
Message:

Branch for merging changes into multilevel-groups.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/jo/multilevel-groups-2/Makefile.config

    r1190 r1343  
    1 # MAINTAINER VERSION OF Makefile.config 
    2 # -*- Makefile -*- 
     1# This is the Makefile.config file to use for a "clean" distribution. 
    32# 
    4 # This file is rigged to overwrite the a debian munin-package as that 
    5 # is what janl uses. 
    6 # 
    7 # $Id$ 
    8  
    93# This file specifies where Munin will look for things after you've 
    104# run 'make' in the source directory.  Modify it to suit your needs. 
    …… 
    137# a shadow tree during make install. 
    148 
    15 # Include the default config 
    16 include Makefile.config-dist 
     9# 
     10# the base of the Munin installation. 
     11#  
     12PREFIX     = $(DESTDIR)/opt/munin 
    1713 
    18 # Then override 
     14# Where Munin keeps its configurations (server.conf, client.conf, ++) 
     15CONFDIR    = $(DESTDIR)/etc/opt/munin 
    1916 
    20 PREFIX     = $(DESTDIR)/usr 
    21 CONFDIR    = $(DESTDIR)/etc/munin 
    22 DOCDIR     = $(PREFIX)/share/doc/munin 
    23 MANDIR     = $(PREFIX)/share/man 
     17# Server only - where to put munin-cron 
     18BINDIR     = $(PREFIX)/bin 
     19 
     20# Client only - where to put munin-node, munin-node-configure, and munin-run 
     21SBINDIR    = $(PREFIX)/sbin 
     22 
     23# Where to put text and html documentation 
     24DOCDIR     = $(PREFIX)/doc 
     25 
     26# Where to put man pages 
     27MANDIR     = $(PREFIX)/man 
    2428 
    2529# Where to put internal binaries and plugin repository 
    26 LIBDIR     = $(PREFIX)/share/munin 
     30LIBDIR     = $(PREFIX)/lib 
    2731 
    2832# Server only - Output directory 
    29 HTMLDIR    = /var/www/munin 
    30 CGIDIR     = $(HTMLDIR)/../cgi 
     33HTMLDIR    = $(PREFIX)/var/www 
     34CGIDIR     = $(HTMLDIR)/cgi 
    3135 
    3236# Client only - Where to put RRD files and other intenal data 
    33 DBDIR      = $(DESTDIR)/var/lib/munin 
     37DBDIR      = $(DESTDIR)/var/opt/munin 
    3438 
    3539# Client only - Where plugins should put their states. Must be writable by 
    …… 
    5054PYTHON     = /usr/bin/env python 
    5155 
    52 # A modern shell.  We're not looking for arrays, but $() and other modern 
    53 # stuff is expected. 
    54 # Linux: /bin/bash 
    55 # SunOS/Solaris: /usr/xpg4/bin/sh or /bin/ksh 
     56# A modern (posix) shell.  We're not looking for arrays, but $() and 
     57# other modern stuff is expected.  On a posix-system the expression 
     58# below will find the right shell.  Most Unixes released the last 10 
     59# years are POSIX compliant enough for this to work (he said bravely). 
     60#  
     61# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh 
    5662# In general: bash or ksh will work 
    57 GOODSH     = /bin/bash 
     63# 
     64GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') 
    5865 
    5966# Path of bash for bash specific plugins 
    …… 
    8390 
    8491# Default user to run the plugins as 
    85 PLUGINUSER = nobody 
     92PLUGINUSER = munin 
    8693 
    8794# Which command to use to check if the USER and GROUP to run Munin as, exists. 
    8895GETENT = $(shell which getent || which true 2>/dev/null) 
    89 CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
    90 CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) 
     96 
     97#CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
     98#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) 
     99 
     100# For OSX, comment out the previous two lines and comment in these 
     101CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
     102CHECKGROUP = $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) 
    91103 
    92104CHOWN      = chown 
    93105CHMOD      = chmod 
    94106CHGRP      = chgrp 
     107 
     108# Check whether setruid functionality can be used 
     109HASSETR = $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) 
     110