--- emacs/src/s/gnu-linux.h	2005-09-03 01:24:03 +0600

+++ emacs/src/s/gnu-linux.h.norpath	2005-09-03 15:02:17 +0600

@@ -195,7 +195,8 @@

 #ifdef __mips__

 #define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX

 #else

-#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX

+/* RH: don't want /usr/X11R6/lib rpath'ed */

+#define LD_SWITCH_SYSTEM

 #endif /* __mips__ */

 /* Link temacs with -z nocombreloc so that unexec works right, whether or