r325 - in /packages/mtasc/trunk/debian: changelog rules

[pabs at users.alioth.debian.org]

Author: pabs
Date: Mon Mar  9 11:15:43 2009
New Revision: 325

URL: http://svn.debian.org/wsvn/?sc=1&rev=325
Log:
Improve the patch and Makefile handling

Modified:
    packages/mtasc/trunk/debian/changelog
    packages/mtasc/trunk/debian/rules

Modified: packages/mtasc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/mtasc/trunk/debian/changelog?rev=325&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/changelog (original)
+++ packages/mtasc/trunk/debian/changelog Mon Mar  9 11:15:43 2009
@@ -8,6 +8,7 @@
   * Bump debhelper compat level to 7
   * Add Vcs-* fields
   * Drop build-dep version numbers satisfied in oldstable/etch
+  * Improve the patch and Makefile handling
 
  -- Paul Wise <pabs at debian.org>  Mon, 09 Mar 2009 16:56:39 +0900
 

Modified: packages/mtasc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/mtasc/trunk/debian/rules?rev=325&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/rules (original)
+++ packages/mtasc/trunk/debian/rules Mon Mar  9 11:15:43 2009
@@ -26,11 +26,10 @@
   CAMLP4 = camlp4o
 endif
 
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	cp ocaml/mtasc/doc/Makefile .
-	make C=$(OCAMLC) O=$(OCAMLOBJECT) A=$(OCAMLARCHIVE) CU=$(OCAMLCUSTOM) CP=$(CAMLP4)
+	$(MAKE) -f ocaml/mtasc/doc/Makefile C=$(OCAMLC) O=$(OCAMLOBJECT) A=$(OCAMLARCHIVE) CU=$(OCAMLCUSTOM) CP=$(CAMLP4)
 	./ocaml/mtasc/mtasc -v -swf helloworld.swf -main -header 640:480:20 ocaml/mtasc/doc/HelloWorld.as
 	./ocaml/mtasc/mtasc -version 8 -v -swf helloworld.swf -main -header 640:480:20 ocaml/mtasc/doc/HelloWorld.as
 	cp ocaml/mtasc/doc/CHANGES.txt NEWS
@@ -39,15 +38,15 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f build-stamp Makefile NEWS helloworld.swf
+	[ ! -f ocaml/mtasc/doc/Makefile ] || $(MAKE) -f ocaml/mtasc/doc/Makefile clean
+	rm -f build-stamp NEWS helloworld.swf
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	make install PREFIX=/usr DESTDIR=debian/mtasc
+	$(MAKE) -f ocaml/mtasc/doc/Makefile install PREFIX=/usr DESTDIR=debian/mtasc
 
 binary-indep: build install
 binary-arch: build install