From 7582b0e5067d7b408dd25d53628e5822aaa3116d Mon Sep 17 00:00:00 2001 From: Ville Kallioniemi Date: Fri, 30 Dec 2011 23:22:48 -0700 Subject: [PATCH] Mac install target for the upnp daemon was trying to install files that don't exist and launchd config file had hardcoded paths. * commented out code that was trying to install files/scripts that don't exist * added a make target for generating launchd config file with accurate install paths * enabled installing man page --- miniupnpd/Makefile.macosx | 15 +++++++++------ ...plist => org.tuxfamily.miniupnpd.plist.before} | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) rename miniupnpd/mac/{org.tuxfamily.miniupnpd.plist => org.tuxfamily.miniupnpd.plist.before} (75%) diff --git a/miniupnpd/Makefile.macosx b/miniupnpd/Makefile.macosx index 57e901b..caa716e 100644 --- a/miniupnpd/Makefile.macosx +++ b/miniupnpd/Makefile.macosx @@ -47,8 +47,8 @@ LIBS = INSTALL_BINDIR = $(PREFIX)/sbin INSTALL_ETCDIR = $(PREFIX)/etc/miniupnpd -# INSTALL_MANDIR = $(PREFIX)/man -INSTALL_MANDIR = /usr/share/man/man1 +INSTALL_MANDIR = $(PREFIX)/man/man1 +#INSTALL_MANDIR = /usr/share/man/man1 all: $(EXECUTABLES) @@ -57,19 +57,19 @@ clean: testupnpdescgen.o testgetifstats.o testupnppermissions.o \ miniupnpdctl.o testgetifaddr.o config.h -install: miniupnpd genuuid +install: miniupnpd genuuid genlaunchd $(STRIP) miniupnpd $(INSTALL) -d $(INSTALL_BINDIR) $(INSTALL) miniupnpd $(INSTALL_BINDIR) $(INSTALL) -d $(INSTALL_ETCDIR) - $(INSTALL) ipfw/ipfw_init.sh $(INSTALL_ETCDIR) - $(INSTALL) ipfw/ipfw_removeall.sh $(INSTALL_ETCDIR) - $(INSTALL) --mode=0644 -b miniupnpd.conf $(INSTALL_ETCDIR) + $(INSTALL) -m 0644 -b miniupnpd.conf $(INSTALL_ETCDIR) $(INSTALL) -d $(INSTALL_MANDIR) $(INSTALL) miniupnpd.1 $(INSTALL_MANDIR) # TODO Fix these paths and those within the plist $(INSTALL) -d $(PREFIX)/Library/LaunchDaemons $(INSTALL) mac/org.tuxfamily.miniupnpd.plist $(PREFIX)/Library/LaunchDaemons + #$(INSTALL) ipfw/ipfw_init.sh $(INSTALL_ETCDIR) + #$(INSTALL) ipfw/ipfw_removeall.sh $(INSTALL_ETCDIR) # genuuid is using the uuid cli tool available under MacOSX UUID != if which uuidgen 2>&1 > /dev/null; then \ @@ -84,6 +84,9 @@ genuuid: sed -e "s/^uuid=[-0-9a-f]*/uuid=$(UUID)/" miniupnpd.conf.before > miniupnpd.conf $(RM) miniupnpd.conf.before +genlaunchd: + sed -e "s|INSTALLPREFIX|$(PREFIX)|g" mac/org.tuxfamily.miniupnpd.plist.before > mac/org.tuxfamily.miniupnpd.plist + depend: config.h mkdep $(ALL_OBJS:.o=.c) testupnpdescgen.c testgetifstats.c \ testupnppermissions.c miniupnpdctl.c testgetifaddr.c diff --git a/miniupnpd/mac/org.tuxfamily.miniupnpd.plist b/miniupnpd/mac/org.tuxfamily.miniupnpd.plist.before similarity index 75% rename from miniupnpd/mac/org.tuxfamily.miniupnpd.plist rename to miniupnpd/mac/org.tuxfamily.miniupnpd.plist.before index 0922d40..ed6e81f 100644 --- a/miniupnpd/mac/org.tuxfamily.miniupnpd.plist +++ b/miniupnpd/mac/org.tuxfamily.miniupnpd.plist.before @@ -7,8 +7,8 @@ org.tuxfamily.miniupnpd ProgramArguments - /usr/sbin/miniupnpd - -f /etc/miniupnpd/miniupnpd.conf + INSTALLPREFIX/sbin/miniupnpd + -f INSTALLPREFIX/etc/miniupnpd/miniupnpd.conf RunAtLoad