pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators put definition of SUSE_VERSION and SUSE_DIR_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/84cfe49de957
branches:  trunk
changeset: 492025:84cfe49de957
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Apr 03 21:23:15 2005 +0000

description:
put definition of SUSE_VERSION and SUSE_DIR_PREFIX into separate file
vars.mk

diffstat:

 emulators/suse91_linux/Makefile.common    |  5 ++---
 emulators/suse91_linux/vars.mk            |  9 +++++++++
 emulators/suse_linux/Makefile.application |  8 +++-----
 emulators/suse_linux/Makefile.common      |  5 ++---
 emulators/suse_linux/vars.mk              |  9 +++++++++
 5 files changed, 25 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r 50a73f57eef8 -r 84cfe49de957 emulators/suse91_linux/Makefile.common
--- a/emulators/suse91_linux/Makefile.common    Sun Apr 03 21:13:31 2005 +0000
+++ b/emulators/suse91_linux/Makefile.common    Sun Apr 03 21:23:15 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.11 2005/04/02 20:15:41 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/04/03 21:23:15 jdolecek Exp $
 
-SUSE_VERSION=          9.1
-
+.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 -r 50a73f57eef8 -r 84cfe49de957 emulators/suse91_linux/vars.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/suse91_linux/vars.mk    Sun Apr 03 21:23:15 2005 +0000
@@ -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 -r 50a73f57eef8 -r 84cfe49de957 emulators/suse_linux/Makefile.application
--- a/emulators/suse_linux/Makefile.application Sun Apr 03 21:13:31 2005 +0000
+++ b/emulators/suse_linux/Makefile.application Sun Apr 03 21:23:15 2005 +0000
@@ -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_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 -r 50a73f57eef8 -r 84cfe49de957 emulators/suse_linux/Makefile.common
--- a/emulators/suse_linux/Makefile.common      Sun Apr 03 21:13:31 2005 +0000
+++ b/emulators/suse_linux/Makefile.common      Sun Apr 03 21:23:15 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/20 12:44:22 rh Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/04/03 21:23:15 jdolecek Exp $
 
-SUSE_VERSION=          7.3
-
+.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 -r 50a73f57eef8 -r 84cfe49de957 emulators/suse_linux/vars.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/suse_linux/vars.mk      Sun Apr 03 21:23:15 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index