2005-05-21 Jeff Muizelaar <jeff@infidigm.net>

	* Makefile:
	* test-gen/image.pl:
	* test-gen/mask.pl:
	* test-gen/text.pl:
	use paths relative to test-gen instead of the project root.

5 files changed, 15 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 96d9e27..1e8dc0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-21  Jeff Muizelaar <jeff@infidigm.net>
+
+	* Makefile:
+	* test-gen/image.pl:
+	* test-gen/mask.pl:
+	* test-gen/text.pl:
+	use paths relative to test-gen instead of the project root.
+
 2005-05-20  Jeff Muizelaar <jeff@infidigm.net>
 
 	* Makefile:
diff --git a/Makefile b/Makefile
index 0a76e9b..a26195d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,4 @@ PDFS = mask.pdf text.pdf image.pdf
 tests: $(PDFS)
 
 $(PDFS): %.pdf: test-gen/%.pl
-	./$< tests/$@
+	cd test-gen && ./$(notdir $<) ../tests/$@
diff --git a/test-gen/image.pl b/test-gen/image.pl
index 9fcf54b..9a95a5c 100755
--- a/test-gen/image.pl
+++ b/test-gen/image.pl
@@ -4,7 +4,7 @@ use Text::PDF::File;
 use Text::PDF::Page;        # pulls in Pages
 use Text::PDF::Utils;       # not strictly needed
 use Text::PDF::SFont;
-do "test-gen/image.inc";
+do "image.inc";
 $pdf = Text::PDF::File->new;            # Make up a new document
 $root = Text::PDF::Pages->new($pdf);    # Make a page tree in the document
 $root->proc_set("PDF", "Text");         # Say that all pages have PDF and Text instructions
@@ -13,7 +13,7 @@ $page = Text::PDF::Page->new($pdf, $root);      # Make a new page in the tree
 $font = Text::PDF::SFont->new($pdf, 'Helvetica', 'F0');     # Make a new font in the document
 $root->add_font($font);                                     # Tell all pages about the font
 
-my ($w,$h,$bpc,$cs,$img)=parseImage('test-gen/romedalen.ppm');
+my ($w,$h,$bpc,$cs,$img)=parseImage('romedalen.ppm');
 my $key='IMG1';
 $xo=PDFDict();
 $xo->{'Type'}=PDFName('XObject');
diff --git a/test-gen/mask.pl b/test-gen/mask.pl
index 9e145e8..d823ce9 100755
--- a/test-gen/mask.pl
+++ b/test-gen/mask.pl
@@ -5,14 +5,14 @@ use Text::PDF::File;
 use Text::PDF::Page;        # pulls in Pages
 use Text::PDF::Utils;       # not strictly needed
 use Text::PDF::SFont;
-do "test-gen/image.inc";
+do "image.inc";
 my $pdf = Text::PDF::File->new;            # Make up a new document
 my $root = Text::PDF::Pages->new($pdf);    # Make a page tree in the document
 $root->proc_set("PDF", "Text");         # Say that all pages have PDF and Text instructions
 $root->bbox(0, 0, 595, 840);            # hardwired page size A4 (for this app.) for all pages
 my $page = Text::PDF::Page->new($pdf, $root);      # Make a new page in the tree
 
-my ($w,$h,$bpc,$cs,$img)=parseImage('test-gen/a.pbm');
+my ($w,$h,$bpc,$cs,$img)=parseImage('a.pbm');
 my $key='IMG1';
 my $xo=PDFDict();
 $xo->{'ImageMask'}=PDFBool('true');
diff --git a/test-gen/text.pl b/test-gen/text.pl
index 8dfb70f..edc590e 100755
--- a/test-gen/text.pl
+++ b/test-gen/text.pl
@@ -4,7 +4,7 @@ use Text::PDF::File;
 use Text::PDF::Page;        # pulls in Pages
 use Text::PDF::Utils;       # not strictly needed
 use Text::PDF::SFont;
-do "test-gen/image.inc";
+do "image.inc";
 $pdf = Text::PDF::File->new;            # Make up a new document
 $root = Text::PDF::Pages->new($pdf);    # Make a page tree in the document
 $root->proc_set("PDF", "Text");         # Say that all pages have PDF and Text instructions
@@ -15,7 +15,7 @@ $root->add_font($font);                                     # Tell all pages abo
 
 $page->add("q\n"); #saveState
 $page->add("BT 1 0 0 1 200 600 Tm /F0 48 Tf 5 Tr (Hello World!) Tj ET\n");        # put some content on the page
-my ($w,$h,$bpc,$cs,$img)=parseImage('test-gen/romedalen.ppm');
+my ($w,$h,$bpc,$cs,$img)=parseImage('romedalen.ppm');
 my $key='IMG1';
 $xo=PDFDict();
 $xo->{'Type'}=PDFName('XObject');