Man page and mac installation fixes.

* fix minissdpd man page not getting installed
* fix miniupnpc man page wasn't installed
* fix minissdpd attempted to install init.d
  file on mac
This commit is contained in:
Ville Kallioniemi 2011-12-31 12:06:17 -07:00
parent e8c488f9e1
commit f9549e86b1
2 changed files with 13 additions and 0 deletions

View File

@ -16,6 +16,7 @@ CFLAGS = -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes
CC = gcc
RM = rm -f
INSTALL = install
OS = $(shell uname -s)
#EXECUTABLES = minissdpd testminissdpd listifaces
EXECUTABLES = minissdpd testminissdpd testcodelength
@ -26,6 +27,8 @@ ALLOBJS = $(MINISSDPDOBJS) $(TESTMINISSDPDOBJS) testcodelength.o
INSTALLPREFIX ?= $(PREFIX)/usr
SBININSTALLDIR = $(INSTALLPREFIX)/sbin
MANINSTALLDIR = $(INSTALLPREFIX)/share/man
.PHONY: all clean install depend
@ -37,8 +40,12 @@ clean:
install: minissdpd
$(INSTALL) -d $(SBININSTALLDIR)
$(INSTALL) minissdpd $(SBININSTALLDIR)
$(INSTALL) -d $(MANINSTALLDIR)/man1
$(INSTALL) minissdpd.1 $(MANINSTALLDIR)/man1/minissdpd.1
ifneq ($(OS), Darwin)
$(INSTALL) -d $(PREFIX)/etc/init.d
$(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
endif
minissdpd: $(MINISSDPDOBJS)
$(CC) $(CFLAGS) -o $@ $(MINISSDPDOBJS)

View File

@ -85,6 +85,7 @@ INSTALLPREFIX ?= $(PREFIX)/usr
INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
INSTALLDIRLIB = $(INSTALLPREFIX)/lib
INSTALLDIRBIN = $(INSTALLPREFIX)/bin
INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
ifneq ($(OS), AmigaOS)
@ -142,6 +143,11 @@ else
$(INSTALL) -m 755 upnpc-shared $(INSTALLDIRBIN)/upnpc
endif
$(INSTALL) -m 755 external-ip.sh $(INSTALLDIRBIN)/external-ip
ifneq ($(OS), AmigaOS)
$(INSTALL) -d $(INSTALLDIRMAN)/man3
$(INSTALL) man3/miniupnpc.3 $(INSTALLDIRMAN)/man3/miniupnpc.3
endif
cleaninstall:
$(RM) -r $(INSTALLDIRINC)