diff -Naur gnome-system-monitor-2.0.3.old/help/C/Makefile.in gnome-system-monitor-2.0.3.new/help/C/Makefile.in --- gnome-system-monitor-2.0.3.old/help/C/Makefile.in Tue Nov 26 11:04:25 2002 +++ gnome-system-monitor-2.0.3.new/help/C/Makefile.in Tue Jan 21 00:20:31 2003 @@ -199,7 +199,7 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/xmldocs.make cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps help/C/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff -Naur gnome-system-monitor-2.0.3.old/omf.make gnome-system-monitor-2.0.3.new/omf.make --- gnome-system-monitor-2.0.3.old/omf.make Tue Nov 26 11:02:50 2002 +++ gnome-system-monitor-2.0.3.new/omf.make Tue Jan 21 00:20:31 2003 @@ -42,7 +42,7 @@ for file in $(omffile); do \ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) +# -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) uninstall-local-omf: -for file in $(srcdir)/*.omf; do \ diff -Naur gnome-system-monitor-2.0.3.old/src/Makefile.in gnome-system-monitor-2.0.3.new/src/Makefile.in --- gnome-system-monitor-2.0.3.old/src/Makefile.in Tue Nov 26 11:04:20 2002 +++ gnome-system-monitor-2.0.3.new/src/Makefile.in Tue Jan 21 00:20:31 2003 @@ -127,7 +127,7 @@ defaulttable.h -gnome_system_monitor_LDADD = @PROCMAN_LIBS@ +gnome_system_monitor_LDADD = @PROCMAN_LIBS@ -lXau -lX11 specdir = $(datadir)/procman diff -Naur gnome-system-monitor-2.0.3.old/src/util.c gnome-system-monitor-2.0.3.new/src/util.c --- gnome-system-monitor-2.0.3.old/src/util.c Tue Nov 26 11:02:50 2002 +++ gnome-system-monitor-2.0.3.new/src/util.c Tue Jan 21 00:20:31 2003 @@ -40,7 +40,7 @@ */ #define OPEN_TTY() getpt() -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__APPLE__) /* FreeBSD doesn't have getpt(). This function emulates it's behaviour. */ int getpt (void); @@ -144,8 +144,15 @@ } if ((env = getenv ("XAUTHORITY")) == NULL) { +#ifdef HAVE_ASPRINTF if (asprintf (&env, "XAUTHORITY=%s/.Xauthority", home) > 0) putenv (env); +#else + if ((env = malloc (1024))) { + snprintf (env, 1024, "XAUTHORITY=%s/.Xauthority", home); + env[1023] = '\0'; + } +#endif else { perror ("Unable to allocate memory chunk"); _exit (-1); @@ -153,8 +160,15 @@ } if ((env = getenv ("ICEAUTHORITY")) == NULL) { +#ifdef HAVE_ASPRINTF if (asprintf (&env, "ICEAUTHORITY=%s/.ICEauthority", home) > 0) putenv (env); +#else + if ((env = malloc (1024))) { + snprintf (env, 1024, "ICEAUTHORITY=%s/.ICEauthority", home); + env[1023] = '\0'; + } +#endif else { perror ("Unable to allocate memory chunk"); _exit (-1);