diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-09-08 15:28:48 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-09-08 15:28:48 -0400 |
| commit | d1110c5c83a7f439158f369ab2f3ae614fa9d2a5 (patch) | |
| tree | 5f118d8dc9e7b9577cbc61f2806f86da51e693b5 | |
| parent | 9deb579dc9366590203afe0576bf88643ab36c89 (diff) | |
Generalize the handling of configuration files that ship with extensions.
| -rw-r--r-- | Xext/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 4deb8e52c..6ea3d7445 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -33,6 +33,10 @@ MODULE_SRCS = \ sync.c \ xcmisc.c +# Extra configuration files ship with some extensions +SERVERCONFIGdir = $(libdir)/xserver +SERVERCONFIG_DATA = + # Optional sources included if extension enabled by configure.ac rules # MIT Shared Memory extension @@ -77,8 +81,7 @@ XCSECURITY_SRCS = security.c securitysrv.h if XCSECURITY BUILTIN_SRCS += $(XCSECURITY_SRCS) -SERVERCONFIGdir = $(libdir)/xserver -SERVERCONFIG_DATA = SecurityPolicy +SERVERCONFIG_DATA += SecurityPolicy AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" endif @@ -157,7 +160,7 @@ libXextmodule_la_SOURCES = $(MODULE_SRCS) endif EXTRA_DIST = \ - SecurityPolicy \ + $(SERVERCONFIG_DATA) \ $(MITSHM_SRCS) \ $(XV_SRCS) \ $(RES_SRCS) \ |