misc/countrycodes: Sanitize MANPREFIX
Reported by: antoine
This commit is contained in:
parent
d449cc2bb7
commit
8d4c199415
1 changed files with 9 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue