diff -Naur gnome-panel-2.0.11.old/applets/gen_util/clock.c gnome-panel-2.0.11.new/applets/gen_util/clock.c
--- gnome-panel-2.0.11.old/applets/gen_util/clock.c	Thu Sep 12 12:58:18 2002
+++ gnome-panel-2.0.11.new/applets/gen_util/clock.c	Thu Jan 23 16:35:45 2003
@@ -14,7 +14,9 @@
 #include <dirent.h>
 #include <string.h>
 #include <time.h>
+#if !defined(__APPLE__)
 #include <langinfo.h>
+#endif
 
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
@@ -726,9 +728,14 @@
 	error = NULL;
 	cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error);
 	if (error || (cd->hourformat != 12 && cd->hourformat != 24)) {
+#if !defined(__APPLE__)
 		/* if value is not valid, set it according to locale */
 		const char *am = nl_langinfo (AM_STR);
 		cd->hourformat = (am[0] == '\0') ? 24 : 12;
+#else
+		/* on Darwin, just set it to 24 because there is no nl_langinfo */
+		cd->hourformat = 24;
+#endif
 
 		if (error)
 			g_error_free (error);
diff -Naur gnome-panel-2.0.11.old/applets/gen_util/help/C/clock/clock-C.omf gnome-panel-2.0.11.new/applets/gen_util/help/C/clock/clock-C.omf
--- gnome-panel-2.0.11.old/applets/gen_util/help/C/clock/clock-C.omf	Sat Sep  7 21:34:06 2002
+++ gnome-panel-2.0.11.new/applets/gen_util/help/C/clock/clock-C.omf	Thu Jan 23 16:35:45 2003
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <omf>
   <resource>
     <creator>
@@ -27,9 +27,9 @@
       user's guide
     </type>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url="clock.xml"/>
+    <identifier url="/sw/share/gnome/help/clock/C/clock.xml"/>
     <language code="C"/>
     <relation seriesid="dc1bc4d4-40e7-11d6-8b82-b4eda00d7b63"/>
     <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
-   </resource>        
+  </resource>
 </omf>
diff -Naur gnome-panel-2.0.11.old/configure gnome-panel-2.0.11.new/configure
--- gnome-panel-2.0.11.old/configure	Fri Nov 15 12:35:22 2002
+++ gnome-panel-2.0.11.new/configure	Thu Jan 23 16:35:45 2003
@@ -5262,7 +5262,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
diff -Naur gnome-panel-2.0.11.old/ltmain.sh gnome-panel-2.0.11.new/ltmain.sh
--- gnome-panel-2.0.11.old/ltmain.sh	Fri Nov 15 12:35:15 2002
+++ gnome-panel-2.0.11.new/ltmain.sh	Thu Jan 23 16:50:06 2003
@@ -2894,6 +2894,11 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
 	  eval cmds=\"$archive_cmds\"
 	fi
 	save_ifs="$IFS"; IFS='~'
@@ -3948,10 +3953,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test $need_relink = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#	  if test "$installed" = no && test $need_relink = yes; then
+#	    $echo >> $output "\
+#relink_command=\"$relink_command\""
+#	  fi
 	done
       fi
 
diff -Naur gnome-panel-2.0.11.old/omf.make gnome-panel-2.0.11.new/omf.make
--- gnome-panel-2.0.11.old/omf.make	Mon May 27 19:49:09 2002
+++ gnome-panel-2.0.11.new/omf.make	Thu Jan 23 16:35:45 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 \