summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-03-08 19:03:32 +0000
committertnn <tnn@pkgsrc.org>2015-03-08 19:03:32 +0000
commitdb0d187470bee9432b839d29da5ec99f2f39520d (patch)
tree79bd256b38e7ecc78d8a5f141fcc96b5d55c8820 /emulators
parent05768cc5dc62cd1f873b75dca22d85da3fa8e8e9 (diff)
downloadpkgsrc-db0d187470bee9432b839d29da5ec99f2f39520d.tar.gz
interim make distinfo handling until we decide how to do a generic fix
Diffstat (limited to 'emulators')
-rw-r--r--emulators/suse121_linux/Makefile.common13
-rw-r--r--emulators/suse131_linux/Makefile.common13
2 files changed, 24 insertions, 2 deletions
diff --git a/emulators/suse121_linux/Makefile.common b/emulators/suse121_linux/Makefile.common
index a06f5534c94..91830f5fb10 100644
--- a/emulators/suse121_linux/Makefile.common
+++ b/emulators/suse121_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2015/02/16 10:15:46 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.9 2015/03/08 19:03:32 tnn Exp $
#
# used by emulators/suse121_alsa/Makefile
# used by emulators/suse121_alsa/Makefile
@@ -129,6 +129,17 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
#
.sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
+.if make(distinfo) || make(makedistinfo) || make(mdi) || make(makesum)
+. if defined(RPMPKGS) && !empty(RPMPKGS)
+RPMPKGS:= ${RPMPKGS:S/${EMUL_ARCH}/i586/} \
+ ${RPMPKGS:S/${EMUL_ARCH}/x86_64/}
+. endif
+. if defined(RPMUPDPKGS) && !empty(RPMUPDPKGS)
+RPMUPDPKGS:= ${RPMUPDPKGS:S/${EMUL_ARCH}/i586/} \
+ ${RPMUPDPKGS:S/${EMUL_ARCH}/x86_64/}
+. endif
+.endif
+
.if defined(RPMPKGS) && !empty(RPMPKGS)
. for distfile in ${RPMPKGS}
DISTFILES+= ${distfile}.rpm
diff --git a/emulators/suse131_linux/Makefile.common b/emulators/suse131_linux/Makefile.common
index 0fa015a34de..845b46c54ff 100644
--- a/emulators/suse131_linux/Makefile.common
+++ b/emulators/suse131_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2015/03/02 19:40:08 tnn Exp $
+# $NetBSD: Makefile.common,v 1.12 2015/03/08 19:03:32 tnn Exp $
#
# used by emulators/suse131_alsa/Makefile
# used by emulators/suse131_aspell/Makefile
@@ -121,6 +121,17 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
#
.sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
+.if make(distinfo) || make(makedistinfo) || make(mdi) || make(makesum)
+. if defined(RPMPKGS) && !empty(RPMPKGS)
+RPMPKGS:= ${RPMPKGS:S/${EMUL_ARCH}/i586/} \
+ ${RPMPKGS:S/${EMUL_ARCH}/x86_64/}
+. endif
+. if defined(RPMUPDPKGS) && !empty(RPMUPDPKGS)
+RPMUPDPKGS:= ${RPMUPDPKGS:S/${EMUL_ARCH}/i586/} \
+ ${RPMUPDPKGS:S/${EMUL_ARCH}/x86_64/}
+. endif
+.endif
+
.if defined(RPMPKGS) && !empty(RPMPKGS)
. for distfile in ${RPMPKGS}
DISTFILES+= ${distfile}.rpm