summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2010-11-29 13:57:20 +0000
committerhauke <hauke@pkgsrc.org>2010-11-29 13:57:20 +0000
commit150e6af0ed74763fcd558ee3600d33dc6311b541 (patch)
treed2a00320e13009e83b4cff9ddfdfcb47852954cc /archivers
parent3b7e644378b371725efeb007f2acc93a2e09debd (diff)
downloadpkgsrc-150e6af0ed74763fcd558ee3600d33dc6311b541.tar.gz
Generally use CPPFLAGS for preprocessor flags, after a hint
of Georg Schwarz.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/unzip/Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 2b7feb48e32..8ff41c8d13a 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2010/11/26 16:06:03 hauke Exp $
+# $NetBSD: Makefile,v 1.76 2010/11/29 13:57:20 hauke Exp $
DISTNAME= unzip60
PKGNAME= unzip-6.0
@@ -22,13 +22,17 @@ CONFLICTS= fcrackzip<1.0nb1
MAKE_FILE= unix/Makefile
BUILD_TARGET= generic_zlib unzipsfx
+
.if ${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin"
-CFLAGS+= -DBSD
+CPPFLAGS+= -DBSD
+.endif
+.if (${OPSYS} == "SunOS" || \
+ ${OPSYS} == "OSF1" || \
+ (${OPSYS} == "Darwin" && !empty(OS_VERSION:M[01234678].*)))
+CPPFLAGS+= -DNO_LCHMOD
.endif
-CFLAGS+= -I. -DUNIX -Dunix -DUSE_UNSHRINK
-CFLAGS.SunOS+= -DNO_LCHMOD
-CFLAGS.Darwin+= -DNO_LCHMOD
-CFLAGS.OSF1+= -DNO_LCHMOD
+CPPFLAGS+= -DUNIX -Dunix -DUSE_UNSHRINK -I.
+
MAKE_FLAGS+= CF=${CPPFLAGS:Q}\ ${CFLAGS:Q}
MAKE_FLAGS+= LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:Q}\ -lz