git: 8d4c19941592 - main - misc/countrycodes: Sanitize MANPREFIX
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 31 Jan 2024 12:59:46 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8d4c19941592c7e505f710bb61dbe5c21b76d8c6
commit 8d4c19941592c7e505f710bb61dbe5c21b76d8c6
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-31 11:50:30 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-31 12:58:34 +0000
misc/countrycodes: Sanitize MANPREFIX
Reported by: antoine
---
misc/countrycodes/files/patch-Makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/misc/countrycodes/files/patch-Makefile b/misc/countrycodes/files/patch-Makefile
index 6feacbe1e117..8f15b3adb460 100644
--- a/misc/countrycodes/files/patch-Makefile
+++ b/misc/countrycodes/files/patch-Makefile
@@ -3,33 +3,33 @@
@@ -9,7 +9,7 @@ bindir ?= ${prefix}/bin
prefix ?= /usr/local
bindir ?= ${prefix}/bin
-
+
-mandir ?= ${prefix}/man/man1
-+mandir ?= ${MANPREFIX}/share/man/man1
-
++mandir ?= ${prefix}/share/man/man1
+
# For system that doesn't support mkdir -p.
# If you have Linux, don't bother.
@@ -23,13 +23,13 @@ LOGDIRMODE=700
LOGDIRMODE=700
-
+
# Compiler to use
-CC=gcc
+CC?=gcc
-
+
# Compiler warnings
-WARNINGS= -pedantic -Wall
+#WARNINGS= -pedantic -Wall
-
+
# Compiler flags
-CCOPTS = -O2 -fomit-frame-pointer
+CCOPTS = ${CFLAGS}
-
+
# The makefile standards document I read says that I have to put it here...
SHELL = /bin/sh
@@ -66,11 +66,11 @@ strip:
strip:
strip $(PROGRAM)
-
+
-install:
- $(MKDIRECTORY) $(DESTDIR)/${bindir} $(DESTDIR)/${mandir}/man1
+install: strip
@@ -38,6 +38,6 @@
@echo "Installing man page..."
- $(INSTALL) -m 644 iso3166.1 $(DESTDIR)/${mandir}/man1
+ $(INSTALL) -m 644 iso3166.1 $(DESTDIR)/${mandir}
-
+
update-man:
@$(SEDBIN) $(SEDCMDS) iso3166.1.in > iso3166.1