./packages/openofficeorg/3.0/experimental r1194: alphabetize BUILD_(ARCH) stanzas
------------------------------------------------------------
revno: 1194
committer: Chris Cheney <ccheney@ubuntu.com>
branch nick: experimental
timestamp: Tue 2008-07-29 11:42:12 -0500
message:
alphabetize BUILD_(ARCH) stanzas
modified:
rules
=== modified file 'rules'
--- a/rules 2008-07-29 01:10:06 +0000
+++ b/rules 2008-07-29 16:42:12 +0000
@@ -281,12 +281,12 @@
#ifeq "$(BUILD_AMD64)" "y"
# OOO_OGLTRANS_ARCHS+= amd64
#endif
+#ifeq "$(BUILD_IA64)" "y"
+# OOO_OGLTRANS_ARCHS+= ia64
+#endif
#ifeq "$(BUILD_PPC64)" "y"
# OOO_OGLTRANS_ARCHS+= ppc64
#endif
-#ifeq "$(BUILD_IA64)" "y"
-# OOO_OGLTRANS_ARCHS+= ia64
-#endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
@@ -298,23 +298,23 @@
ifeq "$(BUILD_AMD64)" "y"
OOO_ARCHS += amd64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_ARCHS += ia64
+endif
ifeq "$(BUILD_PPC64)" "y"
OOO_ARCHS += ppc64
endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_ARCHS += ia64
-endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
OOO_JAVA_ARCHS+= amd64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_JAVA_ARCHS+= ia64
+endif
ifeq "$(BUILD_PPC64)" "y"
OOO_JAVA_ARCHS+= ppc64
endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_JAVA_ARCHS+= ia64
-endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -371,12 +371,12 @@
ifeq "$(BUILD_AMD64)" "y"
OOO_MOZILLA_ARCHS += amd64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_MOZILLA_ARCHS += ia64
+endif
ifeq "$(BUILD_PPC64)" "y"
OOO_MOZILLA_ARCHS += ppc64
endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_MOZILLA_ARCHS += ia64
-endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
Reply to: