status-im/miniupnp
2
0
Fork 0
mirror of https://github.com/status-im/miniupnp.git synced 2025-02-04 02:23:24 +00:00
Code Issues Projects Releases Wiki Activity

UUID generation for the default config file was

Browse Source 
not working on the mac. Man page was getting
installed to the the wrong location.
* change to always use uuidgen (available on all
  osx releases)
* fix regex to match uuidgen's uuid format which
  contains capital letters
* fix mac man page install directory
* make mac clean target delete the generated launchd config file
This commit is contained in:
Ville Kallioniemi 2011-12-31 01:12:39 -07:00
parent 7582b0e506
commit e8c488f9e1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
miniupnpd/Makefile.macosx
View File

@ -47,15 +47,15 @@ LIBS =
INSTALL_BINDIR = $(PREFIX)/sbin
INSTALL_ETCDIR = $(PREFIX)/etc/miniupnpd
INSTALL_MANDIR = $(PREFIX)/man/man1
#INSTALL_MANDIR = /usr/share/man/man1
INSTALL_MANDIR = $(PREFIX)/share/man/man1
all: $(EXECUTABLES)
clean:
$(RM) $(ALL_OBJS) $(EXECUTABLES) \
testupnpdescgen.o testgetifstats.o testupnppermissions.o \
miniupnpdctl.o testgetifaddr.o config.h
miniupnpdctl.o testgetifaddr.o config.h \
mac/org.tuxfamily.miniupnpd.plist
install: miniupnpd genuuid genlaunchd
$(STRIP) miniupnpd
@ -65,23 +65,14 @@ install: miniupnpd genuuid genlaunchd
$(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 \
echo `uuidgen` ; \
elif which uuid 2>&1 > /dev/null; then \
echo `uuid` ; \
else echo "00000000-0000-0000-0000-000000000000"; \
fi
genuuid:
$(MV) miniupnpd.conf miniupnpd.conf.before
sed -e "s/^uuid=[-0-9a-f]*/uuid=$(UUID)/" miniupnpd.conf.before > miniupnpd.conf
sed -e "s/^uuid=[-0-9a-fA-F]*/uuid=`uuidgen 2>/dev/null`/" miniupnpd.conf.before > miniupnpd.conf
$(RM) miniupnpd.conf.before
genlaunchd: