only redefine CONFLICTS if was defined in the first place.
This commit is contained in:
parent
426f4a92b3
commit
86d13c683a
1 changed files with 3 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.4 2011/02/27 15:00:06 chs Exp $
|
||||
# $NetBSD: Makefile.common,v 1.5 2011/02/27 15:41:55 chs Exp $
|
||||
|
||||
SUSE_PKG= yes
|
||||
SUSE_VERSION= 11.3
|
||||
|
@ -59,7 +59,9 @@ PKGDIR= ${SUSE_PKGSRCDIR}
|
|||
.if defined(SUSE_COMPAT32)
|
||||
PKGNAME:= ${DISTNAME:S/^suse_/suse32_/}
|
||||
COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/}
|
||||
.if defined(CONFLICTS)
|
||||
CONFLICTS:= ${CONFLICTS:S/^suse_/suse32_/}
|
||||
.endif
|
||||
LINUX_BASE= linux32
|
||||
.else
|
||||
LINUX_BASE= linux
|
||||
|
|
Loading…
Reference in a new issue