summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-12-11 20:43:49 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-12-11 20:43:49 +0000
commit3d1caeec0b120997b5a958bec586c01665516499 (patch)
treeb2620dd0fdbf590dd371ee736f5a18f48557a1d6 /config
parentaf3cf72277abea12541117e7acc9867a7ad48cb7 (diff)
Bugzilla #5055 <https://bugs.freedesktop.org/show_bug.cgi?id=5055> Add
--with-xdmscriptdir to allow builder/packager to decide if scripts should go in config, lib, or data directories.
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 1650cf3..12f27ea 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,7 +3,7 @@
include $(top_srcdir)/cpprules.in
-xdmlibdir = $(XDMLIBDIR)
+xdmscriptdir = $(XDMSCRIPTDIR)
xdmconfigdir = $(XDMCONFIGDIR)
dist_xdmconfig_DATA = \
@@ -14,10 +14,10 @@ xdmconfig_DATA = \
Xresources \
Xservers
-xdmlib_SCRIPTS = \
+xdmscript_SCRIPTS = \
Xsession
-dist_xdmlib_SCRIPTS = \
+dist_xdmscript_SCRIPTS = \
GiveConsole \
TakeConsole \
Xsetup_0 \
@@ -47,8 +47,8 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \
#endif
CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \
- -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) \
- -DXDMPIDDIR=$(XDMPIDDIR) -DXDMCONFIGDIR=$(XDMCONFIGDIR) \
+ -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
+ -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
-DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
-DSHELL_CMD=$(SHELL_CMD)