Don't strip off a leading "lt-" prefix outside a .libs directory.

diff --git a/ChangeLog b/ChangeLog
index 3215e80e18c8d4cbd6195694e0a4845fcc45da21..62ff4304f0b834f4d8b7df523d87a5cf8308dbdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-07  Bruno Haible  <bruno@clisp.org>
+
+       * lib/progname.c (set_program_name): Don't strip off a leading
+       "lt-" prefix outside a .libs directory.
+       Suggested by Paul Eggert.
+
 2008-01-01  Sylvain Beucler  <beuc@gnu.org>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/progname.c b/lib/progname.c
index 47d08c65d5732517db1bf4315125d1a13d44b178..2b77a5883c8e154bb7585fbd97080f1af1c756b6 100644 (file)
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -42,8 +42,10 @@ set_program_name (const char *argv0)
   slash = strrchr (argv0, '/');
   base = (slash != NULL ? slash + 1 : argv0);
   if (base - argv0 >= 7 && strncmp (base - 7, "/.libs/", 7) == 0)
-    argv0 = base;
-  if (strncmp (base, "lt-", 3) == 0)
-    argv0 = base + 3;
+    {
+      argv0 = base;
+      if (strncmp (base, "lt-", 3) == 0)
+       argv0 = base + 3;
+    }
   program_name = argv0;
 }