[Pkg-ace-commits] [pkg-ace] r560 - in trunk/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-03-08 23:22:50 +0000 (Sat, 08 Mar 2008)
New Revision: 560

Modified:
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
fix mwc invocation


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-03 23:11:35 UTC (rev 559)
+++ trunk/debian/patches/00list	2008-03-08 23:22:50 UTC (rev 560)
@@ -2,7 +2,7 @@
 02-fltk-no-gl
 02-qt4
 04-reduce-opt
-06-revert-mpc-kokyu-change.dpatch
+05-autoconf-fox
 08-fix-perl-shebang
 15-fix-fltk-include
 34-bts386713

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-03-03 23:11:35 UTC (rev 559)
+++ trunk/debian/rules	2008-03-08 23:22:50 UTC (rev 560)
@@ -28,6 +28,8 @@
 MPC_SUBDIR := MPC
 MPC_ARCHIVE := $(shell ls -1 MPC*.tar.gz 2>/dev/null || echo mpc-archive-missing)
 
+MWCFLAGS := -type automake -features "ssl=1,zlib=1,zzip=1,xt=1,tk=1,fl=1,qt=1,fox=1" -noreldefs
+
 MAN1 := debian/Basic_Logging_Service.1 \
 	debian/Event_Logging_Service.1 \
 	debian/Notify_Logging_Service.1 \
@@ -79,7 +81,8 @@
 prepatch-stamp: extract-stamp
 endif
 	dpatch apply-until $(UNTIL)
-	cd $(TAO_ROOT) && ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+	cd $(ACE_ROOT) &&    bin/mwc.pl $(MWCFLAGS) ACE.mwc
+	cd $(TAO_ROOT) && ../bin/mwc.pl $(MWCFLAGS) TAO.mwc
 	touch $@
 
 .PHONY: prepatch
@@ -129,8 +132,6 @@
 build-stamp: configure-stamp
 	dh_testdir
 
-	# Hack to remove when this bug is fixed
-	mkdir -p objdir/ace/QtReactor
 	$(MAKE) -C objdir
 
 	touch $@