[Dh-make-php-commits] r240 - trunk/pecl.template

[Uwe Steinmann]

Author: steinm
Date: 2007-03-28 09:26:12 +0000 (Wed, 28 Mar 2007)
New Revision: 240

Modified:
   trunk/pecl.template/rules
Log:
- do not install php4 module in php5 extension
  The build results from php4 module must be saved before doing an
	'make clean' and building the php5 module.


Modified: trunk/pecl.template/rules
===================================================================
--- trunk/pecl.template/rules	2007-03-28 09:24:13 UTC (rev 239)
+++ trunk/pecl.template/rules	2007-03-28 09:26:12 UTC (rev 240)
@@ -43,7 +43,7 @@
 	(cd $(SOURCE_DIR); \
 	$(PHPIZE)$*; \
 	./configure --with-php-config=$(PHPCONFIG)$* --prefix=/usr)
-	rm -f configure-stamp-v*
+#	rm -f configure-stamp-v*
 	touch $@
 
 build: $(BUILDTARGETS)
@@ -58,8 +58,8 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	(cd $(SOURCE_DIR); $(MAKE))
-	rm -f build-stamp-v*
+	(cd $(SOURCE_DIR); $(MAKE); mkdir -p ../tmp/modules$*; cp modules/* ../tmp/modules$*; $(MAKE) clean)
+#	rm -f build-stamp-v*
 	touch $@
 
 clean: $(CLEANTARGETS)
@@ -74,6 +74,7 @@
 	(cd $(SOURCE_DIR); \
 	$(MAKE) clean; \
 	$(PHPIZE)$* --clean)
+	rm -rf tmp/modules$*
 
 install-v4 install-v5: install-v%: build-v%
 	dh_testdir
@@ -91,7 +92,7 @@
 #		| sed "s/#define ZEND_MODULE_API_NO //"`; \
 #		chmod 644 debian/$(PACKAGE_NAME)/usr/lib/php4/$$VERSION/*.so'
 	mkdir -p debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)
-	install -m 644 -o root -g root $(SOURCE_DIR)/modules/$(PECL_PKG_NAME).so debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)/$(PECL_PKG_NAME).so
+	install -m 644 -o root -g root ../tmp/modules$*/$(PECL_PKG_NAME).so debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)/$(PECL_PKG_NAME).so
 	if [ -f "debian/$(PECL_PKG_NAME).ini" ]; then \
 		mkdir -p debian/$(BIN_PACKAGE_NAME)/etc/php$*/conf.d; \
 		cp debian/$(PECL_PKG_NAME).ini debian/$(BIN_PACKAGE_NAME)/etc/php$*/conf.d; \