--- Makefile.am.old	2005-08-17 04:23:45.000000000 -0600
+++ Makefile.am	2005-10-09 15:23:38.751398856 -0600
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-XCONFDIR = $(sysconfdir)/X11/config/cf
+CONFIGDIR = $(libdir)/X11/config
 
 bin_SCRIPTS = xmkmf
 
@@ -27,7 +27,7 @@
         xmkmf.man
 
 xmkmf: xmkmf.cpp
-	$(RAWCPP) -DCONFIGDIRSPEC=$(XCONFDIR) $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+	$(RAWCPP) -DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
 
 CLEANFILES = xmkmf