[Pkg-ace-devel] r450 - /trunk/debian/rules

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Fri Feb  2 22:15:19 2007
New Revision: 450

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=450
Log:
Really compile *out* of ACE_wrappers directory.

Modified:
    trunk/debian/rules

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=450&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Fri Feb  2 22:15:19 2007
@@ -79,16 +79,16 @@
 	dh_testdir
 
 	# Hack to remove once the bug is fixed
-	mkdir -p $(ACE_ROOT)/objdir/ace/QtReactor
-	$(MAKE) -C $(ACE_ROOT)/objdir
+	mkdir -p objdir/ace/QtReactor
+	$(MAKE) -C objdir
 
-	#$(MAKE) -C $(TAO_ROOT)/CIAO
+	# $(MAKE) -C $(TAO_ROOT)/CIAO
 
 	touch $@
 
 clean:
 	dh_testdir
-	rm -rf *.tmp $(ACE_SUBDIR) $(MPC_SUBDIR) debian/patched $(MAN1) $(MAN5) patch-pl patch extract debian/mpc-ace.sgml build-manpages build-stamp
+	rm -rf *.tmp $(ACE_SUBDIR) $(MPC_SUBDIR) objdir debian/patched $(MAN1) $(MAN5) patch-pl patch extract debian/mpc-ace.sgml build-manpages build-stamp
 
 	dh_clean
 
@@ -98,7 +98,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) -C $(ACE_ROOT)/objdir install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/debian/tmp
 
 	mv $(CURDIR)/debian/tmp/usr/bin/gperf $(CURDIR)/debian/tmp/usr/bin/gperf-ace
 
@@ -184,9 +184,8 @@
 	cd $(ACE_ROOT) && bin/bootstrap
 
 configure-stamp: extract $(ACE_ROOT)/configure
-	dh_testdir
-	mkdir -p $(ACE_ROOT)/objdir
-	cd $(ACE_ROOT)/objdir && ../configure $(confflags) --prefix=/usr --disable-tao-examples --disable-tao-tests --disable-ace-examples --disable-ace-tests --enable-fl-reactor --enable-qt-reactor --enable-tk-reactor  --enable-xt-reactor --enable-symbol-visibility --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME)
+	mkdir -p objdir
+	cd objdir && ../ACE_wrappers/configure $(confflags) --prefix=/usr --disable-tao-examples --disable-tao-tests --disable-ace-examples --disable-ace-tests --enable-fl-reactor --enable-qt-reactor --enable-tk-reactor  --enable-xt-reactor --enable-symbol-visibility --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME)
 	touch $@
 
 .PHONY: build clean binary-indep binary-arch binary install unpatch prepatch prepatchtwo update-makefile update-makefile-complete source diff dpatch bootstrap