summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2005-04-03 21:23:15 +0000
committerjdolecek <jdolecek@pkgsrc.org>2005-04-03 21:23:15 +0000
commit0493cadead33f6852111d6000bc37707a1988123 (patch)
treeccc8a1de8c3310460314824d56a1bb79ddb57633 /emulators
parent3a327d6d06c401a7f2ea7bd26b6e0fa13812f92f (diff)
downloadpkgsrc-0493cadead33f6852111d6000bc37707a1988123.tar.gz
put definition of SUSE_VERSION and SUSE_DIR_PREFIX into separate file
vars.mk
Diffstat (limited to 'emulators')
-rw-r--r--emulators/suse91_linux/Makefile.common5
-rw-r--r--emulators/suse91_linux/vars.mk9
-rw-r--r--emulators/suse_linux/Makefile.application8
-rw-r--r--emulators/suse_linux/Makefile.common5
-rw-r--r--emulators/suse_linux/vars.mk9
5 files changed, 25 insertions, 11 deletions
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common
index be69588725c..3b38687854f 100644
--- a/emulators/suse91_linux/Makefile.common
+++ b/emulators/suse91_linux/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.11 2005/04/02 20:15:41 jdolecek Exp $
-
-SUSE_VERSION= 9.1
+# $NetBSD: Makefile.common,v 1.12 2005/04/03 21:23:15 jdolecek Exp $
+.include "../../emulators/suse91_linux/vars.mk"
.include "../../emulators/suse91_linux/arch.mk"
_SUSE_FTP_SUBDIR= suse/${SUSE_ARCH_DIR}/9.1/suse/${SUSE_ARCH}/
diff --git a/emulators/suse91_linux/vars.mk b/emulators/suse91_linux/vars.mk
new file mode 100644
index 00000000000..ffe221743bb
--- /dev/null
+++ b/emulators/suse91_linux/vars.mk
@@ -0,0 +1,9 @@
+# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
+
+.ifndef SUSE_VARS_MK
+SUSE_VARS_MK=1
+
+SUSE_DIR_PREFIX= suse91
+SUSE_VERSION= 9.1
+
+.endif # SUSE_VARS_MK
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application
index 0b54f3f5adf..bfc0c1b1b61 100644
--- a/emulators/suse_linux/Makefile.application
+++ b/emulators/suse_linux/Makefile.application
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.application,v 1.14 2005/01/15 12:41:33 jdolecek Exp $
+# $NetBSD: Makefile.application,v 1.15 2005/04/03 21:23:15 jdolecek Exp $
.include "../../mk/bsd.prefs.mk"
@@ -13,11 +13,9 @@ _LINUX_SYSCTL_OSRELEASE?= emul.linux.kern.osrelease
LINUX_KERNEL_OSRELEASE!= (/sbin/sysctl -n ${_LINUX_SYSCTL_OSRELEASE} 2>/dev/null; ${ECHO} 2.0.38) | ${HEAD} -1
. if !empty(SUSE_PREFER:M9.1)
-SUSE_DIR_PREFIX= suse91
-SUSE_VERSION= 9.1
+. include "../../emulators/suse91_linux/vars.mk"
. else
-SUSE_DIR_PREFIX= suse
-SUSE_VERSION= 7.3
+. include "../../emulators/suse_linux/vars.mk"
. endif
. if defined(RPMFILES)
diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common
index 7ad5d25d44e..f8874a1bb4e 100644
--- a/emulators/suse_linux/Makefile.common
+++ b/emulators/suse_linux/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/20 12:44:22 rh Exp $
-
-SUSE_VERSION= 7.3
+# $NetBSD: Makefile.common,v 1.21 2005/04/03 21:23:15 jdolecek Exp $
+.include "../../emulators/suse_linux/vars.mk"
.include "../../emulators/suse_linux/arch.mk"
MASTER_SITE_SUSE?= ftp://ftp.suse.com/pub/suse/discontinued/${SUSE_ARCH}/${SUSE_VERSION}/suse/
diff --git a/emulators/suse_linux/vars.mk b/emulators/suse_linux/vars.mk
new file mode 100644
index 00000000000..8ed70cc071a
--- /dev/null
+++ b/emulators/suse_linux/vars.mk
@@ -0,0 +1,9 @@
+# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
+
+.ifndef SUSE_VARS_MK
+SUSE_VARS_MK=1
+
+SUSE_VERSION= 7.3
+SUSE_DIR_PREFIX= suse
+
+.endif # SUSE_VARS_MK