[Pkg-php-commits] [php/debian-sid] Fix two late-night bugs

Raphael Geissert geissert at debian.org
Mon Feb 22 22:26:04 UTC 2010


---
 debian/rules |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 46c3b20..f69ff59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,9 +159,9 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p temp_session_store
 	extensions=""; \
 	for f in $(CURDIR)/apache2-build/modules/*.so; do \
-	    ext=`basename "$${f%.so}"`; \
-	    test ! -f "$(CURDIR)/ext/$$ext/tests/config.inc" || continue; \
-	    test ! -f "$(CURDIR)/ext/$$ext/tests/README" || continue; \
+	    ext=`basename "$$f"`; \
+	    test ! -f "$(CURDIR)/ext/$${ext%.so}/tests/config.inc" || continue; \
+	    test ! -f "$(CURDIR)/ext/$${ext%.so}/tests/README" || continue; \
 	    test "$${ext#pdo}" = "$$ext" || continue; \
 	    extensions="$$extensions -d extension=$$ext"; \
 	done; \
@@ -561,7 +561,7 @@ binary-arch: build install
 		  < debian/php5-module.postinst \
 		| sed -e'/#EXTRA#/ d' \
 		  > debian/php5-$${package}.postinst; \
-		c=`grep -vE '^(#|set|$)' < debian/php5-$${package}.postinst | wc -l`; \
+		c=`grep -vE '^(#|set|$$)' < debian/php5-$${package}.postinst | wc -l`; \
 		[ "$$c" != "0" ] || $(RM) debian/php5-$${package}.postinst; \
 	done
 
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list