Fix make distcheck by eliminating directory components.

svn path=/trunk/yasm/; revision=534

diff --git a/modules/preprocs/yapp/tests/comment.pre b/modules/preprocs/yapp/tests/comment.pre
index 2754fc7a9c368d94aed1cbcca6a8b2b0fd0e5e9b..6d0bfdd314f0f87235d94c92f7801baf9e6d12c4 100644 (file)
--- a/modules/preprocs/yapp/tests/comment.pre
+++ b/modules/preprocs/yapp/tests/comment.pre
@@ -1,2 +1,2 @@
-%line 2+1 ./src/preprocs/yapp/tests/comment.asm
+%line 2+1 -
        mov     ax, 4 

diff --git a/modules/preprocs/yapp/tests/ddefine.pre b/modules/preprocs/yapp/tests/ddefine.pre
index 1a91d077ecab496e8861ef33465d05330339de53..5d2f788dc3286a456eefc9accca601f5e481cb84 100644 (file)
--- a/modules/preprocs/yapp/tests/ddefine.pre
+++ b/modules/preprocs/yapp/tests/ddefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/ddefine.asm
+%line 3+1 -
        mov     ax, [5+baz]
 
 

diff --git a/modules/preprocs/yapp/tests/define.pre b/modules/preprocs/yapp/tests/define.pre
index 2dd362ddfaa8eea388b02c1a5f71bcfc968f6d47..b631ba28af9e2927196bd2961af8b2d9251b11db 100644 (file)
--- a/modules/preprocs/yapp/tests/define.pre
+++ b/modules/preprocs/yapp/tests/define.pre
@@ -1,3 +1,3 @@
-%line 3+1 ./src/preprocs/yapp/tests/define.asm
+%line 3+1 -
        mov     ax, [5+baz]
 

diff --git a/modules/preprocs/yapp/tests/ifdef.pre b/modules/preprocs/yapp/tests/ifdef.pre
index ae2c69e5e20440c257d023540e7fd4a638a6fcaa..4031163b94c6017a4814931f98244828e7edfe42 100644 (file)
--- a/modules/preprocs/yapp/tests/ifdef.pre
+++ b/modules/preprocs/yapp/tests/ifdef.pre
@@ -1,5 +1,5 @@
-%line 9+1 ./src/preprocs/yapp/tests/ifdef.asm
+%line 9+1 -
        mov     ax, 5
 
 
-%line 14+1 ./src/preprocs/yapp/tests/ifdef.asm
+%line 14+1 -

diff --git a/modules/preprocs/yapp/tests/include.pre b/modules/preprocs/yapp/tests/include.pre
index f53beec9cfb86089acaa06a7942fb0ad6a004dfd..418078c02a988f4de7de42c34571c02131a52f02 100644 (file)
--- a/modules/preprocs/yapp/tests/include.pre
+++ b/modules/preprocs/yapp/tests/include.pre
@@ -1,10 +1,10 @@
-%line 1+1 ./src/preprocs/yapp/tests/include.asm
+%line 1+1 -
        mov     ax, 5
 %line 1+1 ./src/preprocs/yapp/tests/raw.asm
        mov     ax, raw
-%line 3+1 ./src/preprocs/yapp/tests/include.asm
+%line 3+1 -
        mov     ax, 6
 %line 1+1 ./src/preprocs/yapp/tests/raw.asm
        mov     ax, raw
-%line 5+1 ./src/preprocs/yapp/tests/include.asm
+%line 5+1 -
        mov     ax, 7

diff --git a/modules/preprocs/yapp/tests/params.pre b/modules/preprocs/yapp/tests/params.pre
index 2826a669cc0b76b8510a55db350fb642cbf8e2ec..dc2cd9876d63f20bd300649d14e7dc94014993bd 100644 (file)
--- a/modules/preprocs/yapp/tests/params.pre
+++ b/modules/preprocs/yapp/tests/params.pre
@@ -1,2 +1,2 @@
-%line 2+1 ./src/preprocs/yapp/tests/params.asm
+%line 2+1 -
     ((a+b,c))+((d*e,f))

diff --git a/modules/preprocs/yapp/tests/pdefine.pre b/modules/preprocs/yapp/tests/pdefine.pre
index 0054ee847ba7f93322726e7d7c7d0e139fd03aee..553799d912a670f583ac643eb8bbaa08081f1ae3 100644 (file)
--- a/modules/preprocs/yapp/tests/pdefine.pre
+++ b/modules/preprocs/yapp/tests/pdefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/pdefine.asm
+%line 3+1 -
        mov     ax, foo
        mov     ax, 5+1
        mov     ax, 5-3

diff --git a/modules/preprocs/yapp/tests/raw.pre b/modules/preprocs/yapp/tests/raw.pre
index e545b8144c28ee555936b1bc232e88d3eb05d3a3..3bf6062128e02f692d617f481d6643cfdc872341 100644 (file)
--- a/modules/preprocs/yapp/tests/raw.pre
+++ b/modules/preprocs/yapp/tests/raw.pre
@@ -1,2 +1,2 @@
-%line 1+1 ./src/preprocs/yapp/tests/raw.asm
+%line 1+1 -
        mov     ax, raw

diff --git a/modules/preprocs/yapp/tests/rdefine.pre b/modules/preprocs/yapp/tests/rdefine.pre
index 16d1330dd9ff985cfc29a171916f0d2e42e28df6..dfc1bfac661eb791f50f37ef646c3bc4837cd233 100644 (file)
--- a/modules/preprocs/yapp/tests/rdefine.pre
+++ b/modules/preprocs/yapp/tests/rdefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/rdefine.asm
+%line 3+1 -
        mov     ax, 5
        mov     ax, endless
 

diff --git a/modules/preprocs/yapp/tests/rinclude.pre b/modules/preprocs/yapp/tests/rinclude.pre
index ece1dc8237052b3005141f8b8b6292f816430124..63ac7fcdd4f3f540c3466539873e0eae00ff87cb 100644 (file)
--- a/modules/preprocs/yapp/tests/rinclude.pre
+++ b/modules/preprocs/yapp/tests/rinclude.pre
@@ -1,3 +1,3 @@
-%line 4+1 ./src/preprocs/yapp/tests/rinclude.asm
+%line 4+1 -
        mov ax, 5 
 

diff --git a/modules/preprocs/yapp/tests/yapp_test.sh b/modules/preprocs/yapp/tests/yapp_test.sh
index f555fd19e15d7fccd4eae037c9e896ac95f26a6d..a77e73682f055084f0c900b67c5f327f03563f11 100755 (executable)
--- a/modules/preprocs/yapp/tests/yapp_test.sh
+++ b/modules/preprocs/yapp/tests/yapp_test.sh
@@ -22,7 +22,8 @@ do
     p=`echo ${asm} | sed -e 's,.asm$,.pre,'`
 
     echo -n "$YT: Testing yapp for ${a} ..."
-    if ./yasm -e ${asm} > ${y}; then
+    if sed -e "s,\./,${srcdir}/," ${asm} | ./yasm -e |
+       sed -e "s,${srcdir}/,./," > ${y}; then
        if diff -w ${p} ${y} > /dev/null; then
            echo " PASS."
            passedct=`expr $passedct + 1`

diff --git a/src/preprocs/yapp/tests/comment.pre b/src/preprocs/yapp/tests/comment.pre
index 2754fc7a9c368d94aed1cbcca6a8b2b0fd0e5e9b..6d0bfdd314f0f87235d94c92f7801baf9e6d12c4 100644 (file)
--- a/src/preprocs/yapp/tests/comment.pre
+++ b/src/preprocs/yapp/tests/comment.pre
@@ -1,2 +1,2 @@
-%line 2+1 ./src/preprocs/yapp/tests/comment.asm
+%line 2+1 -
        mov     ax, 4 

diff --git a/src/preprocs/yapp/tests/ddefine.pre b/src/preprocs/yapp/tests/ddefine.pre
index 1a91d077ecab496e8861ef33465d05330339de53..5d2f788dc3286a456eefc9accca601f5e481cb84 100644 (file)
--- a/src/preprocs/yapp/tests/ddefine.pre
+++ b/src/preprocs/yapp/tests/ddefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/ddefine.asm
+%line 3+1 -
        mov     ax, [5+baz]
 
 

diff --git a/src/preprocs/yapp/tests/define.pre b/src/preprocs/yapp/tests/define.pre
index 2dd362ddfaa8eea388b02c1a5f71bcfc968f6d47..b631ba28af9e2927196bd2961af8b2d9251b11db 100644 (file)
--- a/src/preprocs/yapp/tests/define.pre
+++ b/src/preprocs/yapp/tests/define.pre
@@ -1,3 +1,3 @@
-%line 3+1 ./src/preprocs/yapp/tests/define.asm
+%line 3+1 -
        mov     ax, [5+baz]
 

diff --git a/src/preprocs/yapp/tests/ifdef.pre b/src/preprocs/yapp/tests/ifdef.pre
index ae2c69e5e20440c257d023540e7fd4a638a6fcaa..4031163b94c6017a4814931f98244828e7edfe42 100644 (file)
--- a/src/preprocs/yapp/tests/ifdef.pre
+++ b/src/preprocs/yapp/tests/ifdef.pre
@@ -1,5 +1,5 @@
-%line 9+1 ./src/preprocs/yapp/tests/ifdef.asm
+%line 9+1 -
        mov     ax, 5
 
 
-%line 14+1 ./src/preprocs/yapp/tests/ifdef.asm
+%line 14+1 -

diff --git a/src/preprocs/yapp/tests/include.pre b/src/preprocs/yapp/tests/include.pre
index f53beec9cfb86089acaa06a7942fb0ad6a004dfd..418078c02a988f4de7de42c34571c02131a52f02 100644 (file)
--- a/src/preprocs/yapp/tests/include.pre
+++ b/src/preprocs/yapp/tests/include.pre
@@ -1,10 +1,10 @@
-%line 1+1 ./src/preprocs/yapp/tests/include.asm
+%line 1+1 -
        mov     ax, 5
 %line 1+1 ./src/preprocs/yapp/tests/raw.asm
        mov     ax, raw
-%line 3+1 ./src/preprocs/yapp/tests/include.asm
+%line 3+1 -
        mov     ax, 6
 %line 1+1 ./src/preprocs/yapp/tests/raw.asm
        mov     ax, raw
-%line 5+1 ./src/preprocs/yapp/tests/include.asm
+%line 5+1 -
        mov     ax, 7

diff --git a/src/preprocs/yapp/tests/params.pre b/src/preprocs/yapp/tests/params.pre
index 2826a669cc0b76b8510a55db350fb642cbf8e2ec..dc2cd9876d63f20bd300649d14e7dc94014993bd 100644 (file)
--- a/src/preprocs/yapp/tests/params.pre
+++ b/src/preprocs/yapp/tests/params.pre
@@ -1,2 +1,2 @@
-%line 2+1 ./src/preprocs/yapp/tests/params.asm
+%line 2+1 -
     ((a+b,c))+((d*e,f))

diff --git a/src/preprocs/yapp/tests/pdefine.pre b/src/preprocs/yapp/tests/pdefine.pre
index 0054ee847ba7f93322726e7d7c7d0e139fd03aee..553799d912a670f583ac643eb8bbaa08081f1ae3 100644 (file)
--- a/src/preprocs/yapp/tests/pdefine.pre
+++ b/src/preprocs/yapp/tests/pdefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/pdefine.asm
+%line 3+1 -
        mov     ax, foo
        mov     ax, 5+1
        mov     ax, 5-3

diff --git a/src/preprocs/yapp/tests/raw.pre b/src/preprocs/yapp/tests/raw.pre
index e545b8144c28ee555936b1bc232e88d3eb05d3a3..3bf6062128e02f692d617f481d6643cfdc872341 100644 (file)
--- a/src/preprocs/yapp/tests/raw.pre
+++ b/src/preprocs/yapp/tests/raw.pre
@@ -1,2 +1,2 @@
-%line 1+1 ./src/preprocs/yapp/tests/raw.asm
+%line 1+1 -
        mov     ax, raw

diff --git a/src/preprocs/yapp/tests/rdefine.pre b/src/preprocs/yapp/tests/rdefine.pre
index 16d1330dd9ff985cfc29a171916f0d2e42e28df6..dfc1bfac661eb791f50f37ef646c3bc4837cd233 100644 (file)
--- a/src/preprocs/yapp/tests/rdefine.pre
+++ b/src/preprocs/yapp/tests/rdefine.pre
@@ -1,4 +1,4 @@
-%line 3+1 ./src/preprocs/yapp/tests/rdefine.asm
+%line 3+1 -
        mov     ax, 5
        mov     ax, endless
 

diff --git a/src/preprocs/yapp/tests/rinclude.pre b/src/preprocs/yapp/tests/rinclude.pre
index ece1dc8237052b3005141f8b8b6292f816430124..63ac7fcdd4f3f540c3466539873e0eae00ff87cb 100644 (file)
--- a/src/preprocs/yapp/tests/rinclude.pre
+++ b/src/preprocs/yapp/tests/rinclude.pre
@@ -1,3 +1,3 @@
-%line 4+1 ./src/preprocs/yapp/tests/rinclude.asm
+%line 4+1 -
        mov ax, 5 
 

diff --git a/src/preprocs/yapp/tests/yapp_test.sh b/src/preprocs/yapp/tests/yapp_test.sh
index f555fd19e15d7fccd4eae037c9e896ac95f26a6d..a77e73682f055084f0c900b67c5f327f03563f11 100755 (executable)
--- a/src/preprocs/yapp/tests/yapp_test.sh
+++ b/src/preprocs/yapp/tests/yapp_test.sh
@@ -22,7 +22,8 @@ do
     p=`echo ${asm} | sed -e 's,.asm$,.pre,'`
 
     echo -n "$YT: Testing yapp for ${a} ..."
-    if ./yasm -e ${asm} > ${y}; then
+    if sed -e "s,\./,${srcdir}/," ${asm} | ./yasm -e |
+       sed -e "s,${srcdir}/,./," > ${y}; then
        if diff -w ${p} ${y} > /dev/null; then
            echo " PASS."
            passedct=`expr $passedct + 1`