diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-06 20:14:43 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-06 20:14:43 +0000 |
| commit | 370b8c8f1cb1a3531d52ea3b430852a0d76b2a4c (patch) | |
| tree | 8ba9f9eddcae4faf0c9e8155033eb354897bf224 /hw/xfree86/utils/xorgcfg | |
| parent | 2770233069d3845c681bea8eccff22e92254487e (diff) | |
App-defaults file not supposed to have .ad suffix when installed Fix cpp
rules to set needed flags for app-defaults file
Diffstat (limited to 'hw/xfree86/utils/xorgcfg')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/Makefile.am | 13 |
1 files 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 |