Index: libgale/misc_terminal.c --- libgale/misc_terminal.c.orig 2000-09-18 04:11:58 +0200 +++ libgale/misc_terminal.c 2005-02-18 15:48:22 +0100 @@ -19,7 +19,7 @@ /* This needs to be here for Solaris. */ #include -extern int wcwidth(wchar_t); +extern int gale_wcwidth(wchar_t); static FILE *out_fp = NULL; static int term_cols = 0; @@ -86,7 +86,7 @@ const wch *ptr = out.p,*end = out.l + out.p; int count = 0; for (; end != ptr; ++ptr) - switch (wcwidth(*ptr)) { + switch (gale_wcwidth(*ptr)) { case -1: case 0: break; case 2: ++count; Index: libgale/wcwidth.c --- libgale/wcwidth.c.orig 2002-12-31 06:08:50 +0100 +++ libgale/wcwidth.c 2005-02-18 15:47:54 +0100 @@ -32,7 +32,7 @@ * in ISO 10646. */ -int wcwidth(wchar_t ucs) +int gale_wcwidth(wchar_t ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ static const struct interval { Index: Makefile.in --- Makefile.in.orig 2003-01-12 16:19:09 +0100 +++ Makefile.in 2005-02-18 16:16:22 +0100 @@ -421,11 +421,6 @@ @echo "*** now run $(DESTDIR)$(bindir)/gale-install ... even for an upgrade ***" install-exec-local: - $(PROG_LDCONFIG) || true - test "x$(DESTDIR)$(bindir)" != "x$(DESTDIR)$(sbindir)" && \ - ln -s "$(DESTDIR)$(sbindir)/gksign" \ - "$(DESTDIR)$(bindir)/gksign.tmp.$$$$" && \ - mv "$(DESTDIR)$(bindir)/gksign.tmp.$$$$" "$(DESTDIR)$(bindir)/gksign" # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.