--- config/XView.tmpl.orig	2006-01-25 10:03:52.000000000 -0500
+++ config/XView.tmpl.orig	2006-01-25 10:04:30.000000000 -0500
@@ -23,13 +23,13 @@ 
  *	Where to install XView libraries
  */
 #ifndef XVLibraryDestination
-#define XVLibraryDestination $(XVDESTDIR)/lib
+#define XVLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%
 #endif
 /*
  *	Where to install XView lint libraries
  */
 #ifndef XVLintLibraryDestination
-#define XVLintLibraryDestination $(XVDESTDIR)/lib/lint
+#define XVLintLibraryDestination $(XVDESTDIR)/%GENTOO_LIBDIR%/lint
 #endif
 /*
  *      Where to install the XView clients.  By default, the MIT configuration
--- config/XView.cf.orig	2006-01-25 12:49:28.000000000 -0500
+++ config/XView.cf.orig	2006-01-25 12:48:19.000000000 -0500
@@ -118,7 +118,7 @@ 
  *	the appropriate value.
  */
 #ifndef XVDestDir
-#define XVDestDir /usr/X11R6
+#define XVDestDir /usr
 #endif
 /*
  *	Command to add object modules to the library.
--- Build-LinuxXView.bash.orig	2006-01-25 01:21:17.000000000 -0500
+++ Build-LinuxXView.bash.orig	2006-01-25 13:23:34.000000000 -0500
@@ -18,17 +18,17 @@ 
 
 # Set the directories that will be used for installation
 [ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin
-[ -z "$X11DIR" ] && X11DIR=/usr/X11R6
+[ -z "$X11DIR" ] && X11DIR=/usr
 OWDEST=$DESTDIR$OPENWINHOME
-X11DEST=$DESTDIR$X11DIR/lib/X11/config
+X11DEST=$DESTDIR$X11DIR/%GENTOO_LIBDIR%/X11/config
 
 # Generate file that gets appended to every Makefile created by the imake-wrapper
 
 # BUILDPREFIX can be used to compile with shared libraries not installed in
 # the standard locations
 if [ -n "$BUILDPREFIX" ]; then
-  IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/X11R6/include -I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
-  IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/X11R6/lib -L$BUILDPREFIX/usr/lib -L$BUILDPREFIX/lib"
+  IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/include -I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
+  IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/usr/%GENTOO_LIBDIR% -L$BUILDPREFIX/%GENTOO_LIBDIR%"
 fi
 cat > imake.append <<EOF
 
@@ -37,14 +37,14 @@ 
   EXTRA_DEFINES  = -DOPENWINHOME_DEFAULT=\"$OPENWINHOME\"
   CONFIGDIR      = $X11DEST
   INCLUDES      := -I`pwd`/build/include $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)
-  LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/lib \$(LOCAL_LDFLAGS)
+  LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/%GENTOO_LIBDIR% \$(LOCAL_LDFLAGS)
   MAKEOVERRIDES  =
 # End of variable-definitions appended by imake-wrapper
 
 EOF
 
 IMAKEAPPEND="`pwd`/imake.append"
-IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/X11R6/lib/X11/config -I$BUILDPREFIX/lib/X11/config -I/usr/X11R6/lib/X11/config"
+IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/%GENTOO_LIBDIR%/X11/config -I$BUILDPREFIX/%GENTOO_LIBDIR%/X11/config -I/usr/%GENTOO_LIBDIR%/X11/config"
 
 # Make sure our wrappers are in the path
 if [ -z "$XVIEW_SETUP" ]; then
@@ -110,10 +110,10 @@ 
       ) || exit $?
       ;;
     instfinish)
-      [ -e $OWDEST/lib/openwin-menu-std ] || mv $OWDEST/lib/openwin-menu $OWDEST/lib/openwin-menu-std
+      [ -e $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std ] || mv $OWDEST/%GENTOO_LIBDIR%/openwin-menu $OWDEST/%GENTOO_LIBDIR%/openwin-menu-std
       install -d $OWDEST/lib/xview $OWDEST/share/locale/C/props
-      install -m 644 contrib/misc/openwin-menu* $OWDEST/lib
-      install -m 755 contrib/misc/Xinitrc $OWDEST/lib
+      install -m 644 contrib/misc/openwin-menu* $OWDEST/%GENTOO_LIBDIR%
+      install -m 755 contrib/misc/Xinitrc $OWDEST/%GENTOO_LIBDIR%
       install -m 755 contrib/misc/{openwin,owplaces} $OWDEST/bin
       install -m 644 contrib/misc/props-locale.C $OWDEST/share/locale/C/props/C
       install -m 644 contrib/misc/props-locale.basic_setting $OWDEST/share/locale/C/props/basic_setting
@@ -127,7 +127,7 @@ 
     tar)
       DIRNAME="`pwd`"
       DIRNAME="${DIRNAME##*/}"
-      ( cd $DESTDIR/ && tar cv ${OPENWINHOME##/} ${X11DIR##/}/lib/X11/config/XView.* ) | \
+      ( cd $DESTDIR/ && tar cv ${OPENWINHOME##/} ${X11DIR##/}/%GENTOO_LIBDIR%/X11/config/XView.* ) | \
         gzip -9 > ../$DIRNAME.bin.tar.gz
       ;;
     srctar)