X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fprogname.h;h=82615c6bc05bffd10d9631f9c47b0e24ccd96b47;hb=fe18f20f2ac58f3fda945a633eccb85acc83e3e1;hp=5292cd1bfd387a2f049e7315dc5b285d2cb7737a;hpb=74d8ea7d7e6ddae0710eb0e158da06c8209b3805;p=gnulib.git

diff --git a/lib/progname.h b/lib/progname.h
index 5292cd1bf..82615c6bc 100644
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -1,11 +1,11 @@
 /* Program name management.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 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
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PROGNAME_H
 #define _PROGNAME_H
@@ -42,6 +41,7 @@ extern void set_program_name (const char *argv0);
 extern void set_program_name_and_installdir (const char *argv0,
 					     const char *orig_installprefix,
 					     const char *orig_installdir);
+#undef set_program_name
 #define set_program_name(ARG0) \
   set_program_name_and_installdir (ARG0, INSTALLPREFIX, INSTALLDIR)