[pkg-db-commits] [SCM] UNNAMED PROJECT branch, debian-sid, updated. debian/5.1.25-8-6-g3361858

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit c3e4c7c45eb0684dc191c813eceb56ede3139434
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Apr 21 17:03:41 2011 +0200

    Fix HOST vs BUILD variables (Closes: #623543)

diff --git a/debian/rules b/debian/rules
index 570a7fe..31ae721 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,12 +54,12 @@ endif
 JAVA_HOME ?= /usr/lib/jvm/default-java
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 
-ifeq (,$(filter $(DEB_BUILD_ARCH), $(JAVA_BROKEN_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
 #enable java
 CONFIGURE_SWITCHES += --enable-java
 DH_PLUGINS += --with=javahelper
 # don't build java-gcj package on non-native or broken archs
-ifeq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
 DH_OPTIONS += -Nlibdb5.1-java-gcj
 endif
 else
@@ -143,9 +143,9 @@ override_dh_clean:
 	DH_OPTIONS="" dh_clean
 
 override_jh_installlibs:
-ifeq (,$(filter $(DEB_BUILD_ARCH), $(JAVA_BROKEN_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
 	jh_installlibs
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
 	dh_nativejava
 endif
 endif

-- 
UNNAMED PROJECT