[Libreoffice-commits] .: Makefile.am

[Jan Holesovsky]

 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e3c17115ffbbdeea4ec7611afb24da682d1f1e1
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Nov 2 14:52:55 2010 +0100

    I hate Makefile's '$' quoting :-(

diff --git a/Makefile.am b/Makefile.am
index be5f08e..e543251 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,9 +168,9 @@ smoketest: $(BUILDDIR)/install/program/ooenv
 	( ( . $(OOBUILDDIR)/*.Set.sh ; export SAL_USE_VCLPLUGIN="svp" ; \
 	    cd $(OOBUILDDIR)/test && build.pl && deliver.pl && \
 	    cd $(OOBUILDDIR)/smoketestoo_native && build.pl ) & \
-	  ( COMMAND_PID=$! ; DELAY=$((15*60)) ; \
+	  ( COMMAND_PID=$$! ; DELAY=$$((15*60)) ; \
 	    while test "$$DELAY" -gt "0" && ps "$$COMMAND_PID" > /dev/null ; do \
-	        sleep 1 ; DELAY=$(($DELAY-1)) ; \
+	        sleep 1 ; DELAY=$$(($$DELAY-1)) ; \
 	    done ; \
 	    ps "$$COMMAND_PID" > /dev/null && ( kill "$$COMMAND_PID" ; echo "Smoketest timed out, killed." ; exit 1 ) ) )