r12300 - /packages/unstable/java-access-bridge/debian/rules
kartikm-guest at users.alioth.debian.org
kartikm-guest at users.alioth.debian.org
Thu Aug 9 18:20:42 UTC 2007
Author: kartikm-guest
Date: Thu Aug 9 18:20:42 2007
New Revision: 12300
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12300
Log:
Better clean rule, Better --build and --host configure
Modified:
packages/unstable/java-access-bridge/debian/rules
Modified: packages/unstable/java-access-bridge/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/java-access-bridge/debian/rules?rev=12300&op=diff
==============================================================================
--- packages/unstable/java-access-bridge/debian/rules (original)
+++ packages/unstable/java-access-bridge/debian/rules Thu Aug 9 18:20:42 2007
@@ -13,7 +13,21 @@
CFLAGS = -Wall -g
LDFLAGS = -Wl,-z,defs
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# configure flags
+common_configure_flags := \
+ CFLAGS="$(CFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
+ --prefix=/usr \
+ --with-java-home=${JAVA_HOME}
+ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+else
+ common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -23,10 +37,7 @@
config.status: configure
dh_testdir
- ./configure CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --with-java-home=${JAVA_HOME} \
- --prefix=/usr
+ ./configure ${common_configure_flags}
build: build-stamp
build-stamp: config.status
@@ -38,7 +49,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) -i distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
# cleanups
rm -f `find -name Makefile`
More information about the pkg-gnome-commits
mailing list