7 files changed, 17 insertions, 10 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 4503837..738a3ce 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -145,6 +145,13 @@ CFLAGS-scanf15.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
 CFLAGS-scanf17.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
 		   -I../wctype
 
+CFLAGS-bug3.c += -DOBJPFX=\"$(objpfx)\"
+CFLAGS-bug4.c += -DOBJPFX=\"$(objpfx)\"
+CFLAGS-bug5.c += -DOBJPFX=\"$(objpfx)\"
+CFLAGS-test-fseek.c += -DOBJPFX=\"$(objpfx)\"
+CFLAGS-test-popen.c += -DOBJPFX=\"$(objpfx)\"
+CFLAGS-test_rdwr.c += -DOBJPFX=\"$(objpfx)\"
+
 # tst-gets.c tests a deprecated function.
 CFLAGS-tst-gets.c += -Wno-deprecated-declarations
 
diff --git a/stdio-common/bug3.c b/stdio-common/bug3.c
index 6b2ed6b..62a6cab 100644
--- a/stdio-common/bug3.c
+++ b/stdio-common/bug3.c
@@ -6,7 +6,7 @@ main (void)
 {
   FILE *f;
   int i;
-  const char filename[] = "/tmp/bug3.test";
+  const char filename[] = OBJPFX "bug3.test";
 
   f = fopen(filename, "w+");
   for (i=0; i<9000; i++)
diff --git a/stdio-common/bug4.c b/stdio-common/bug4.c
index a037786..cf7fe11 100644
--- a/stdio-common/bug4.c
+++ b/stdio-common/bug4.c
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
   FILE *f;
   int i;
   char buffer[31];
-  const char filename[] = "/tmp/bug4.test";
+  const char filename[] = OBJPFX "bug4.test";
 
   while ((i = getopt (argc, argv, "rw")) != -1)
     switch (i)
diff --git a/stdio-common/bug5.c b/stdio-common/bug5.c
index f655845..7bfe9b2 100644
--- a/stdio-common/bug5.c
+++ b/stdio-common/bug5.c
@@ -14,8 +14,8 @@ main (void)
 {
   FILE *in;
   FILE *out;
-  static char inname[] = "/tmp/bug5.in";
-  static char outname[] = "/tmp/bug5.out";
+  static char inname[] = OBJPFX "bug5test.in";
+  static char outname[] = OBJPFX "bug5test.out";
   char *printbuf;
   size_t i;
   int result;
diff --git a/stdio-common/test-fseek.c b/stdio-common/test-fseek.c
index c313911..17cd90b 100644
--- a/stdio-common/test-fseek.c
+++ b/stdio-common/test-fseek.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#define TESTFILE "/tmp/test.dat"
+#define TESTFILE OBJPFX "test.dat"
 
 static int
 do_test (void)
diff --git a/stdio-common/test-popen.c b/stdio-common/test-popen.c
index 6e98d3c..206f212 100644
--- a/stdio-common/test-popen.c
+++ b/stdio-common/test-popen.c
@@ -59,7 +59,7 @@ do_test (void)
      the perhaps incompatible new shared libraries.  */
   unsetenv ("LD_LIBRARY_PATH");
 
-  output = popen ("/bin/cat >/tmp/tstpopen.tmp", "w");
+  output = popen ("/bin/cat >" OBJPFX "tstpopen.tmp", "w");
   if (output == NULL)
     {
       perror ("popen");
@@ -69,10 +69,10 @@ do_test (void)
   write_data (output);
   wstatus = pclose (output);
   printf ("writing pclose returned %d\n", wstatus);
-  input = popen ("/bin/cat /tmp/tstpopen.tmp", "r");
+  input = popen ("/bin/cat " OBJPFX "tstpopen.tmp", "r");
   if (input == NULL)
     {
-      perror ("/tmp/tstpopen.tmp");
+      perror (OBJPFX "tstpopen.tmp");
       puts ("Test FAILED!");
       exit (1);
     }
@@ -80,7 +80,7 @@ do_test (void)
   rstatus = pclose (input);
   printf ("reading pclose returned %d\n", rstatus);
 
-  remove ("/tmp/tstpopen.tmp");
+  remove (OBJPFX "tstpopen.tmp");
 
   errno = 0;
   output = popen ("/bin/cat", "m");
diff --git a/stdio-common/test_rdwr.c b/stdio-common/test_rdwr.c
index f471570..3489873 100644
--- a/stdio-common/test_rdwr.c
+++ b/stdio-common/test_rdwr.c
@@ -38,7 +38,7 @@ main (int argc, char **argv)
   else
     name = *argv;
 
-  (void) sprintf (filename, "/tmp/%s.test", name);
+  (void) sprintf (filename, OBJPFX "%s.test", name);
 
   f = fopen (filename, "w+");
   if (f == NULL)