Install patches from David J. Mackenzie to make the srcdir option

	work.
	* Makefile.in (srcdir, VPATH): Get this value from the top-level
	Makefile.
	(INSTALLABLES): Split this into two lists - INSTALLABLES and
	INSTALLABLE_SCRIPTS.
	(INSTALLABLE_SCRIPTS): New list.
	(EXECUTABLES): Include INSTALLABLE_SCRIPTS.
	(${archlibdir}): The scripts to be installed live in the source
	tree, not in the object tree.
	(test-distrib): Note that the data file lives in the source tree,
	not the object tree.
	(GETOPTDEPS): Note that getopt.h lives in the source tree.
	(all other targets): Change references to source files to use
	${srcdir}, except for config.h, which lives in the object dir.
	(timer.o): Note that this depends on ../src/config.h.
	* make-docfile.c (main): Add a -d option, to tell it where to find
	the source files.
	* test-distrib.c (main): Take the name of the distribution file to
	test from the command line.

2 files changed, 19 insertions, 5 deletions

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index c71fafb887b..62ccfe9460b 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -56,6 +56,11 @@ main (argc, argv)
       outfile = fopen (argv[i + 1], "a");
       i += 2;
     }
+  if (argc > i + 1 && !strcmp (argv[i], "-d"))
+    {
+      chdir (argv[i + 1]);
+      i += 2;
+    }
 
   for (; i < argc; i++)
     err_count += scan_file (argv[i]);	/* err_count seems to be {mis,un}used */
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index e1f5be11861..897922a3bf5 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -32,13 +32,21 @@ cool_read (fd, buf, size)
     }
 }
 
-main ()
+main (argc, argv)
+     int argc;
+     char **argv;
 {
-  int fd = open ("testfile", 0);
+  int fd;
 
+  if (argc != 2)
+    {
+      fprintf (stderr, "Usage: %s testfile\n", argv[0]);
+      exit (2);
+    }
+  fd = open (argv[1], 0);
   if (fd < 0)
     {
-      perror ("opening `testfile'");
+      perror (argv[1]);
       exit (2);
     }
   if (cool_read (fd, buf, sizeof string1) != sizeof string1 ||
@@ -46,9 +54,10 @@ main ()
       cool_read (fd, buf, sizeof string2) != sizeof string2 - 1 ||
       strncmp (buf, string2, sizeof string2 - 1))
     {
-      fprintf (stderr, "Data in file `testfile' has been damaged.\n\
+      fprintf (stderr, "Data in file `%s' has been damaged.\n\
 Most likely this means that many nonprinting characters\n\
-have been corrupted in the files of Emacs, and it will not work.\n");
+have been corrupted in the files of Emacs, and it will not work.\n",
+	       argv[1]);
       exit (2);
     }
   close (fd);