X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=daa6847d8b4184349d1c5143e6e75b98f55e3b40;hb=c51f8c8fe906ca0eb8f2d45d8c592f397d6729d9;hp=d7b5e4697e984b8147540da5abfcacb6b89d2283;hpb=4683799c195c17b3a1495ff4a13092c2f45a0be9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index d7b5e4697..daa6847d8 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -16,12 +16,12 @@ BASE = $(DESTDIR)@BASE_DIR@
 CONPATH = $(DESTDIR)@CONFIG_DIR@
 MODPATH = $(DESTDIR)@MODULE_DIR@
 BINPATH = $(DESTDIR)@BINARY_DIR@
+LAUNCHDPATH = $(DESTDIR)/System/Library/LaunchDaemons
 LIBPATH = $(DESTDIR)@LIBRARY_DIR@
 LIB_EXT = @LIBRARY_EXT@
 MODULES = @MODULES@
-STATICLIBS = @STATICLIBS@
 INSTMODE = 0755
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}' 'INSTMODE=${INSTMODE}'
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}'
 
 all: @MAKEORDER@ finishmessage
 
@@ -66,7 +66,7 @@ ircd:
 	@echo "*************************************"
 	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
-install: all
+install: all@EXTRA_DIR@
 	@-install -d -m $(INSTMODE) ${BASE}
 	@-install -d -m $(INSTMODE) $(LIBPATH)
 	@-install -d -m $(INSTMODE) $(BINPATH)
@@ -94,8 +94,10 @@ install: all
 	-install -m $(INSTMODE) src/libIRCDxline.$(LIB_EXT) $(LIBPATH)
 	-install -m $(INSTMODE) src/libIRCDtimer.$(LIB_EXT) $(LIBPATH)
 	-install -m $(INSTMODE) src/libIRCDsnomasks.$(LIB_EXT) $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDserver.$(LIB_EXT) $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDfilelogger.$(LIB_EXT) $(LIBPATH)
 	-install -m $(INSTMODE) src/inspircd $(BINPATH)
-	-install -m $(INSTMODE) inspircd $(BASE) 2>/dev/null
+	-install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null
 	-install -m $(INSTMODE) src/cmd_admin.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_away.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_clearcache.so $(LIBPATH)
@@ -136,14 +138,12 @@ install: all
 	-install -m $(INSTMODE) src/cmd_server.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_squit.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_stats.so $(LIBPATH)
-	-install -m $(INSTMODE) src/cmd_summon.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_time.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_topic.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_trace.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_unloadmodule.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_user.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_userhost.so $(LIBPATH)
-	-install -m $(INSTMODE) src/cmd_users.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_version.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_wallops.so $(LIBPATH)
 	-install -m $(INSTMODE) src/cmd_who.so $(LIBPATH)
@@ -195,6 +195,9 @@ modclean:
 
 squeakyclean: distclean
 
+launchd_dir:
+	@-install -d -m $(INSTMODE) ${LAUNCHDPATH}
+
 configureclean:
 	rm -f .config.cache
 	rm src/modules/Makefile