diff options
| author | tnn <tnn> | 2015-03-10 01:42:13 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-10 01:42:13 +0000 |
| commit | ac81fa4366c4a490dc576f1d84dfbfee565f22a4 (patch) | |
| tree | a3469a5a3d051f9a03ebe4d04e8532e955bd0cd8 /emulators | |
| parent | cbd8d115f1a810c4811c9bda2f95db925c2cee95 (diff) | |
| download | pkgsrc-ac81fa4366c4a490dc576f1d84dfbfee565f22a4.tar.gz | |
Partially revert previous, apparently there exists "make emul-distinfo"
Turn "make distinfo" into an error instead.
Thanks to anonymous for the hint.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/suse121_linux/Makefile.common | 11 | ||||
| -rw-r--r-- | emulators/suse131_linux/Makefile.common | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/emulators/suse121_linux/Makefile.common b/emulators/suse121_linux/Makefile.common index 91830f5fb10..62ff47ed782 100644 --- a/emulators/suse121_linux/Makefile.common +++ b/emulators/suse121_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2015/03/08 19:03:32 tnn Exp $ +# $NetBSD: Makefile.common,v 1.10 2015/03/10 01:42:13 tnn Exp $ # # used by emulators/suse121_alsa/Makefile # used by emulators/suse121_alsa/Makefile @@ -130,14 +130,7 @@ 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 +PKG_FAIL_REASON= "please use make emul-fetch or make emul-distinfo" .endif .if defined(RPMPKGS) && !empty(RPMPKGS) diff --git a/emulators/suse131_linux/Makefile.common b/emulators/suse131_linux/Makefile.common index 845b46c54ff..9ea2d6c61a3 100644 --- a/emulators/suse131_linux/Makefile.common +++ b/emulators/suse131_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2015/03/08 19:03:32 tnn Exp $ +# $NetBSD: Makefile.common,v 1.13 2015/03/10 01:42:13 tnn Exp $ # # used by emulators/suse131_alsa/Makefile # used by emulators/suse131_aspell/Makefile @@ -122,14 +122,7 @@ 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 +PKG_FAIL_REASON= "please use make emul-fetch or make emul-distinfo" .endif .if defined(RPMPKGS) && !empty(RPMPKGS) |