[Dh-make-php-commits] r203 - in trunk: . pear.template

[Charles Fry]

Author: cfry-guest
Date: 2006-06-03 01:22:19 +0000 (Sat, 03 Jun 2006)
New Revision: 203

Modified:
   trunk/pear.mk
   trunk/pear.template/rules
Log:
moved debhelper.mk call out of pear.mk into pear.template/rules


Modified: trunk/pear.mk
===================================================================
--- trunk/pear.mk	2006-06-02 12:30:15 UTC (rev 202)
+++ trunk/pear.mk	2006-06-03 01:22:19 UTC (rev 203)
@@ -26,8 +26,6 @@
 ifndef _cdbs_class_pear
 _cdbs_class_pear := 1
 
-include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
-
 # modify these variables as necessary
 PEAR_PKG := $(shell /usr/bin/xmlstarlet sel -t -v '/package/name/text()' package.xml)
 PEAR_PKG_VERSION := $(shell /usr/bin/xmlstarlet sel -t -v '/package/release/version/text()' package.xml)

Modified: trunk/pear.template/rules
===================================================================
--- trunk/pear.template/rules	2006-06-02 12:30:15 UTC (rev 202)
+++ trunk/pear.template/rules	2006-06-03 01:22:19 UTC (rev 203)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
 # template debian/rules provided by dh-make-php.
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/pear.mk