[Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/20 23:36:16

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfc.all: Makefile.am 

Log message:
                * testsuite/misc-swfc.all/Makefile.am: use an absolute
                  path for MEDIADIR to make swfc happy; don't do anything
                  on make check if SWFC is not enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4048&r2=1.4049
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4048
retrieving revision 1.4049
diff -u -b -r1.4048 -r1.4049
--- ChangeLog   20 Aug 2007 22:59:25 -0000      1.4048
+++ ChangeLog   20 Aug 2007 23:36:15 -0000      1.4049
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-swfc.all/Makefile.am: use an absolute
+         path for MEDIADIR to make swfc happy; don't do anything
+         on make check if SWFC is not enabled.
+
 2007-08-21 Benjamin Wolsey <address@hidden>
 
        * libbase/rc.{cpp,h}: Fixes a typo, matches the whole username if

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfc.all/Makefile.am 10 Aug 2007 18:59:34 -0000      1.3
+++ testsuite/misc-swfc.all/Makefile.am 20 Aug 2007 23:36:16 -0000      1.4
@@ -32,11 +32,13 @@
 
 EXTRA_DIST = $(SCTESTS) $(AUXMOVIES) check.sc Dejagnu.sc
 
-#if ENABLE_SWFC
+if ENABLE_SWFC
+
+abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
 
 #SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
-SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(srcdir)/../media'
+SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(abs_mediadir)'
 
 SCTESTS_OUT = $(SCTESTS:.sc=.swf)
 
@@ -83,4 +85,4 @@
        @echo "# This is a list of the pre-compiled testcases" >> site.exp
        @echo "set testcases \"$(TEST_CASES)\"" >> site.exp
 
-#endif
+endif # ENABLE_SWFC