Merge branch 'NetHack-3.6'

util/dlb_main.c

@@ -198,6 +198,9 @@ char **argv;
             if (ap == argc)
                 usage();
             library_file = argv[ap++];
+#ifdef VERSION_IN_DLB_FILENAME
+            library_file = build_dlb_filename(library_file);
+#endif
             if (fseen)
                 printf("Warning: multiple f options.  Previous ignored.\n");
             fseen = 1;

util/makedefs.c

@@ -1522,7 +1522,11 @@ static const char *build_opts[] = {
     "ZLIB data file compression",
 #endif
 #ifdef DLB
+#ifndef VERSION_IN_DLB_FILENAME
     "data librarian",
+#else
+    "data librarian with a version-dependent name",
+#endif
 #endif
 #ifdef DUMPLOG
     "end-of-game dumplogs",