| 1 | --- Makefile.config.1.4.4.orig 2010-04-25 09:38:13.000000000 -0500 |
|---|
| 2 | +++ Makefile.config 2010-04-25 09:38:56.000000000 -0500 |
|---|
| 3 | @@ -126,9 +126,9 @@ |
|---|
| 4 | # Which command to use to check if the USER and GROUP to run Munin as, exists. |
|---|
| 5 | # These will work on most modern OSes: |
|---|
| 6 | # |
|---|
| 7 | -GETENT := $(shell which getent || which true 2>/dev/null) |
|---|
| 8 | -CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) |
|---|
| 9 | -CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) |
|---|
| 10 | +#GETENT := $(shell which getent || which true 2>/dev/null) |
|---|
| 11 | +#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) |
|---|
| 12 | +#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) |
|---|
| 13 | |
|---|
| 14 | # For OSX, comment out the previous two lines and comment in these |
|---|
| 15 | # |
|---|
| 16 | @@ -137,8 +137,8 @@ |
|---|
| 17 | |
|---|
| 18 | # For OSX 10.5 (Leopard), use the following two lines instead of what's above |
|---|
| 19 | # |
|---|
| 20 | -#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) |
|---|
| 21 | -#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) |
|---|
| 22 | +CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) |
|---|
| 23 | +CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) |
|---|
| 24 | |
|---|
| 25 | |
|---|
| 26 | # For HP-UX, use these instead: |
|---|
