From 370b8c8f1cb1a3531d52ea3b430852a0d76b2a4c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu, 6 Oct 2005 20:14:43 +0000
Subject: [PATCH] App-defaults file not supposed to have .ad suffix when
 installed Fix cpp     rules to set needed flags for app-defaults file

---
 hw/xfree86/utils/xorgcfg/Makefile.am | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index af2136a79..98195d083 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -109,17 +109,19 @@ XPM_DATA = \
         monitor.xpm \
         mouse.xpm
 
+# Rules needed to cpp man page & app-defaults
+include $(top_srcdir)/cpprules.in
+
 # App default files  (*.ad)
 
 appdefaultdir = $(sysconfdir)/X11/app-defaults
 
-APPDEFAULTFILES = XOrgCfg.ad
+APPDEFAULTFILES = XOrgCfg
 
 appdefault_DATA = $(APPDEFAULTFILES)
 
-XOrgCfg.ad: XOrgCfg.pre
-	$(RAWCPP) $(RAWCPPFLAGS) -D__VENDORNAME__="@VENDOR_STRING@" \
-               -D__VENDORVERS__="@VENDOR_RELEASE@" -o $@ $<
+CPP_FILES_FLAGS = -D__VENDORNAME__="@VENDOR_STRING@" \
+                  -D__VENDORVERS__="@VENDOR_RELEASE@"
 
 # Man page
 man1_MANS =  xorgcfg.man
@@ -130,7 +132,4 @@ EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
 
 CLEANFILES = $(APPDEFAULTFILES) $(man1_MANS)
 
-# Rules needed to cpp man page
-include $(top_srcdir)/cpprules.in
-
 endif