diff options
| author | chs <chs@pkgsrc.org> | 2011-02-27 15:41:55 +0000 |
|---|---|---|
| committer | chs <chs@pkgsrc.org> | 2011-02-27 15:41:55 +0000 |
| commit | 86d13c683ae9baa6c394d41ef866171b011239b1 (patch) | |
| tree | 7af7ac8d698a7e8b137193f454bdced9213175ff /emulators | |
| parent | 426f4a92b3b9fe7ee9bd2b599a4041a85381970b (diff) | |
| download | pkgsrc-86d13c683ae9baa6c394d41ef866171b011239b1.tar.gz | |
only redefine CONFLICTS if was defined in the first place.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/suse113_linux/Makefile.common | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/emulators/suse113_linux/Makefile.common b/emulators/suse113_linux/Makefile.common index 874d9f49fa0..28c29d376df 100644 --- a/emulators/suse113_linux/Makefile.common +++ b/emulators/suse113_linux/Makefile.common @@ -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 |