$NetBSD$

--- motif/lib/Xm/util/Makefile.orig	2007-09-25 06:19:59.000000000 +0200
+++ motif/lib/Xm/util/Makefile
@@ -128,12 +128,12 @@ TCLIBDIR = /usr/lib
          IMAKESRC = $(CONFIGSRC)/imake
         DEPENDSRC = $(CONFIGSRC)/util
 
-          INCROOT = /usr/X11R6/include
-        USRLIBDIR = /usr/X11R6/lib
+          INCROOT = %%X11BASE%%/include
+        USRLIBDIR = %%X11BASE%%/lib
         VARLIBDIR = /var/lib
-         SHLIBDIR = /usr/X11R6/lib
+         SHLIBDIR = %%X11BASE%%/lib
        LINTLIBDIR = $(USRLIBDIR)/lint
-          MANPATH = /usr/X11R6/man
+          MANPATH = %%X11BASE%%/man
     MANSOURCEPATH = $(MANPATH)/man
            MANDIR = $(MANSOURCEPATH)1
         LIBMANDIR = $(MANSOURCEPATH)3
@@ -230,7 +230,7 @@ CXXEXTRA_INCLUDES =
      INSTDATFLAGS = -m 0444
     INSTKMEMFLAGS = -m 4711
 
-      PROJECTROOT = /usr/X11R6
+      PROJECTROOT = %%X11BASE%%
 
       #CDEBUGFLAGS = -O2 -fno-strength-reduce
       CDEBUGFLAGS = 
@@ -304,7 +304,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN 
 # X Window System make variables; these need to be coordinated with rules
 
              XTOP = $(TOP)
-           BINDIR = /usr/X11R6/bin
+           BINDIR = %%X11BASE%%/bin
      BUILDINCROOT = $(TOP)/exports
       BUILDINCDIR = $(BUILDINCROOT)/include
       BUILDINCTOP = ../..
@@ -634,7 +634,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN 
 # X Window System make variables; these need to be coordinated with rules
 
              XTOP = $(TOP)
-           BINDIR = /usr/X11R6/bin
+           BINDIR = %%X11BASE%%/bin
      BUILDINCROOT = $(TOP)/exports
       BUILDINCDIR = $(BUILDINCROOT)/include
       BUILDINCTOP = ../..
@@ -955,7 +955,7 @@ TOP_MOTIF_INCLUDES =
 
     MOTIFENVLIBDIR = $(USRLIBDIR)
 
-      USRINCDIR = /usr/X11R6/include
+      USRINCDIR = %%X11BASE%%/include
          UIDDIR = $(LIBDIR)/uid
         TESTSRC = $(MTOP)/tests
         TESTLIB = $(TESTSRC)/lib