Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

scm (5d9-3) unstable; urgency=low

  * Properly clean up info files.
  * Make and install Xlibscm.info.

scm (5d9-2) unstable; urgency=low

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

scm (5d9-1) unstable; urgency=low

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

1 files changed, 13 insertions, 28 deletions

diff --git a/script.c b/script.c
index 5cbe10f..e186eb9 100644
--- a/script.c
+++ b/script.c
@@ -155,34 +155,6 @@ char *script_find_executable(name)
 }
 #endif /* unix */
 
-#ifdef MSDOS
-# define DEFAULT_PATH "C:\\DOS"
-# define PATH_DELIMITER ';'
-# define ABSOLUTE_FILENAME_P(fname) ((fname[0] == '\\') \
-				     || (fname[0] && (fname[1] == ':')))
-
-char *dld_find_executable(file)
-     const char *file;
-{
-  /* fprintf(stderr, "dld_find_executable %s -> %s\n", file, scm_cat_path(0L, file, 0L)); fflush(stderr); */
-  return scm_cat_path(0L, file, 0L);
-}
-#endif /* def MSDOS */
-
-#ifdef __IBMC__
-# define PATH_DELIMITER ';'
-# define ABSOLUTE_FILENAME_P(fname) ((fname[0] == '/') \
-             || (fname[0] == '\\') \
-             || (fname[0] && (fname[1] == ':')))
-
-char *dld_find_executable(file)
-     const char *file;
-{
-  /* fprintf(stderr, "dld_find_executable %s -> %s\n", file, scm_cat_path(0L, file, 0L)); fflush(stderr); */
-  return scm_cat_path(0L, file, 0L);
-}
-#endif /* def __IBMC__ */
-
 /* Given dld_find_executable()'s best guess for the pathname of this
    executable, find (and verify the existence of) initname in the
    implementation-vicinity of this program.  Returns a newly allocated
@@ -420,3 +392,16 @@ int script_count_argv(argv)
   while (argv[argc]) argc++;
   return argc;
 }
+
+#ifdef __IBMC__
+# define MSDOS
+#endif
+
+#ifdef MSDOS
+char *dld_find_executable(file)
+     const char *file;
+{
+  /* fprintf(stderr, "dld_find_executable %s -> %s\n", file, scm_cat_path(0L, file, 0L)); fflush(stderr); */
+  return scm_cat_path(0L, file, 0L);
+}
+#endif /* def MSDOS */