option to suppress launchctl fiddling on install

diff --git a/server/Makefile.am b/server/Makefile.am
index 92f3de2bee4632710cbc0c4a64a2632fba955ba5..9b92ee821eed209a0484616f9f2a4fc272cc759a 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,4 +1,3 @@
-
 #
 # This file is part of DisOrder.
 # Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
@@ -106,8 +105,10 @@ install-data-hook:
        @if [ -d ${LAUNCHD} ]; then \
          echo $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
          $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
-         echo launchctl unload ${LAUNCHD} \|\| true;\
-         launchctl unload ${LAUNCHD} || true;\
-         echo launchctl load ${LAUNCHD} \|\| true;\
-         launchctl load ${LAUNCHD} || true;\
+         if [ "$$(NOLAUNCH)" != "" ]; then \
+           echo launchctl unload ${LAUNCHD} \|\| true;\
+           launchctl unload ${LAUNCHD} || true;\
+           echo launchctl load ${LAUNCHD} \|\| true;\
+           launchctl load ${LAUNCHD} || true;\
+         fi;\
        fi