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

./packages/openofficeorg/3.0/experimental r1326: generalize



------------------------------------------------------------
revno: 1326
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-12-01 23:10:51 +0100
message:
  generalize
modified:
  rules
=== modified file 'rules'
--- a/rules	2008-12-01 15:07:49 +0000
+++ b/rules	2008-12-01 22:10:51 +0000
@@ -111,6 +111,7 @@
 endif
 ENABLE_MONO=y
 MONO_MINVER= (>= 2.0.1)
+MONO2=y
 USE_SYSTEM_HUNSPELL=y
 HUNSPELL_MIN_VER= (>= 1.1.5-2)
 SYSTEM_ALTLINUXHYPH=y
@@ -253,6 +254,7 @@
 ifeq "$(LENNY_BACKPORT)" "y"
   USE_SYSTEM_LUCENE=n
   MONO_MINVER= (>= 1.2.3)
+  MONO2=n
 endif
 
 #############
@@ -654,7 +656,7 @@
 endif
 
 ifneq "$(OOO_MONO_ARCHS)" ""
-  ifneq "$(LENNY_BACKPORT)" "y"
+  ifeq "$(MONO2)" "y"
 	BUILD_DEPS += , mono-devel $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)]
   else
 	# mono-gmcs for gmcs itself and mkbundle2
@@ -668,7 +670,7 @@
 	MONO_SHARED_DIR = $(CURDIR)
 	export MONO_SHARED_DIR
 	CONFIGURE_FLAGS+= --enable-mono
-  ifneq "$(LENNY_BACKPORT)" "y"
+  ifeq "$(MONO2)" "y"
 	CONFIGURE_FLAGS += MCS=/usr/bin/csc GMCS=/usr/bin/csc MKBUNDLE2=/usr/bin/mkbundle
   endif
 	DBG_DBG_SUGGESTS += , mono-jit-dbg [$(OOO_MONO_ARCHS)], libmono0-dbg [$(OOO_MONO_ARCHS)], mono-dbg [$(OOO_MONO_ARCHS)]


Reply to: