diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2011-02-25 11:00:59 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2011-02-25 11:00:59 +0000 |
| commit | d88a3287e7b5d47fc841b7aee796f351319b63f7 (patch) | |
| tree | 4f2cbf4dc8ff07c1af86ef1cc9a078d4e64f2a63 /Mk | |
| parent | a2ee9211ad5bd1b39f7505ca8533308e59b5362f (diff) | |
| download | ports-d88a3287e7b5d47fc841b7aee796f351319b63f7.tar.gz ports-d88a3287e7b5d47fc841b7aee796f351319b63f7.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.linux-apps.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.linux-rpm.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk index d5aaa663183b..b71bc2199883 100644 --- a/Mk/bsd.linux-apps.mk +++ b/Mk/bsd.linux-apps.mk @@ -48,7 +48,7 @@ LINUX_DIST_SUFFIX= -f10 . else IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\" . endif -. elif ${OSVERSION} < 800076 +. elif ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" # default for OSVERSION < 800076 LINUX_DIST_SUFFIX= . else diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index a18bf567eb9c..f71adc198072 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.24 2010-10-28 21:00:06 erwin Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.25 2011-02-25 11:00:59 pav Exp $ # # Variables: @@ -63,7 +63,7 @@ LINUX_RPM_ARCH?= ${ARCH} Linux_RPM_Post_Include= bsd.linux-rpm.mk LINUX_DIST?= fedora -. if ${OSVERSION} < 800076 +. if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" LINUX_DIST_VER?= 4 . else LINUX_DIST_VER?= 10 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1381e53997c0..36fb761b516e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1949,7 +1949,7 @@ USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX:L} == "yes" -. if ${OSVERSION} < 800076 +. if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4 . else LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10 |