[Pkg-jed-commit] r804 - jed/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-07-17 19:54:19 +0000 (Tue, 17 Jul 2007)
New Revision: 804

Modified:
   jed/trunk/debian/changelog
   jed/trunk/debian/rules
Log:
* debian/rules:
  + Allow catching errors from "make disclean" by checking the existence
    of Makefile instead of prefixing the command with a hyphen
  + Use "$(MAKE)" everywhere instead of "make"



Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog	2007-07-17 19:53:44 UTC (rev 803)
+++ jed/trunk/debian/changelog	2007-07-17 19:54:19 UTC (rev 804)
@@ -6,6 +6,10 @@
     + Capitalized titles
   * debian/README.Debian: Added FQA entry about how to cancel commands
     that prompt the user with "y/n" choices (closes: #426873)
+  * debian/rules:
+    + Allow catching errors from "make disclean" by checking the existence
+      of Makefile instead of prefixing the command with a hyphen
+    + Use "$(MAKE)" everywhere instead of "make"
 
  --
 

Modified: jed/trunk/debian/rules
===================================================================
--- jed/trunk/debian/rules	2007-07-17 19:53:44 UTC (rev 803)
+++ jed/trunk/debian/rules	2007-07-17 19:54:19 UTC (rev 804)
@@ -28,7 +28,7 @@
 clean: unpatch
 	dh_testdir
 	dh_clean
-	-make distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp install-stamp
 	# fixme-upstream
 	rm -f src/config.h
@@ -52,7 +52,7 @@
         # libc. OTHERLIBS introduces a dependency on libm that is also solved
         # by libc. XRENDERFONTLIBS fixes a problem with libxft-dev that defines
         # libfontconfig.
-	make DL_LIB="" OTHERLIBS=-lutil XRENDERFONTLIBS=-lXft jed xjed # getmail
+	$(MAKE) DL_LIB="" OTHERLIBS=-lutil XRENDERFONTLIBS=-lXft jed xjed # getmail
 
 	touch build-stamp
 
@@ -63,7 +63,7 @@
 	dh_clean -i --keep
 	dh_installdirs -i
 
-	make DESTDIR=$(jed-common) install
+	$(MAKE) DESTDIR=$(jed-common) install
 	rm -r $(jed-common)/usr/bin/ $(jed-common)/usr/share/man/
 	# fixme-upstream
 	rm -r $(jed-common)/usr/share/jed/bin/