mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 04:30:37 -04:00
4476787a18
- Stop calling uuidgen on port Makefile, miniupnpd Makefile already does it - Do not modify CFLAGS since it's already attributed using ?= - Remove do-install: target from ports Makefile, let miniupnpd Makefile installs it - Patch miniupnpd Makefile to install conf with .sample suffix - Patch miniupnpd Makefile to install manpage in the proper place, respecting MANPREFIX PR: 203191 [1] Submitted by: Tor Halvard Furulund <squat@squat.no> [1] Approved by: Tor Halvard Furulund <squat@squat.no> (maintainer) Sponsored by: Rubicon Communications (Netgate)
35 lines
1.2 KiB
Text
35 lines
1.2 KiB
Text
--- Makefile.orig 2015-04-30 09:08:34 UTC
|
|
+++ Makefile
|
|
@@ -160,8 +160,7 @@ LIBS += -lssl -lcrypto
|
|
|
|
INSTALLBINDIR = $(PREFIX)/sbin
|
|
INSTALLETCDIR = $(PREFIX)/etc
|
|
-# INSTALLMANDIR = $(PREFIX)/man
|
|
-INSTALLMANDIR = /usr/share/man
|
|
+INSTALLMANDIR = $(MANPREFIX)/man
|
|
|
|
all: $(EXECUTABLES)
|
|
|
|
@@ -178,10 +177,10 @@ install: miniupnpd genuuid
|
|
$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
|
|
$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
|
|
$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
|
|
- $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
|
|
+ $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample
|
|
# TODO : install man page correctly
|
|
-# $(INSTALL) -d $(INSTALLMANDIR)
|
|
-# $(INSTALL) miniupnpd.8 $(INSTALLMANDIR)/cat8/miniupnpd.0
|
|
+ $(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
|
|
+ $(INSTALL) miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
|
|
|
|
# genuuid is using the uuid cli tool available under OpenBSD 4.0 in
|
|
# the uuid-1.5.0 package
|
|
@@ -204,7 +203,7 @@ depend: config.h
|
|
testgetroute.c testportinuse.c testasyncsendto.c
|
|
|
|
miniupnpd: config.h $(ALLOBJS)
|
|
- $(CC) $(CFLAGS) -o $@ $(ALLOBJS) $(LIBS)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
|
|
|
|
# BSDmake :
|
|
# $(CC) $(CFLAGS) -o $@ $> $(LIBS)
|