diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-11 20:43:49 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-11 20:43:49 +0000 |
| commit | 3d1caeec0b120997b5a958bec586c01665516499 (patch) | |
| tree | b2620dd0fdbf590dd371ee736f5a18f48557a1d6 | |
| parent | af3cf72277abea12541117e7acc9867a7ad48cb7 (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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | config/Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 6 |
4 files changed, 24 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2005-12-11 Alan Coopersmith <alan.coopersmith@sun.com> + + * README: + * configure.ac: + * config/Makefile.am: + * config/xdm-config.cpp: + 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. + 2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org> * Makefile.am: @@ -8,7 +8,8 @@ Log files: /var/log Process id/lock files: /var/run These may be overridden with the following options to configure: -Scripts & modules: --with-xdmlibdir +Loadable modules: --with-xdmlibdir +Scripts: --with-xdmscriptdir (or --with-xdmlibdir) Configuration files: --with-xdmconfigdir (or --with-xdmlibdir) Pixmap files: --with-xdmpixmapdir (or --with-xdmlibdir) Log files: --with-logdir @@ -16,6 +17,6 @@ Process id/lock files: --with-piddir For instance, some packagers/sites may prefer: --with-xdmconfigdir=/etc/X11/xdm --with-xdmlibdir=$(prefix)/lib/xdm - + --with-xdmscriptdir=/etc/X11/xdm $Id$ 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) diff --git a/configure.ac b/configure.ac index 44b72be..3b1c723 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,12 @@ AC_ARG_WITH(xdmconfigdir, [XDMCONFIGDIR="$withval"], [XDMCONFIGDIR="${XDMLIBDIR}"]) AC_SUBST(XDMCONFIGDIR) +AC_ARG_WITH(xdmscriptdir, + AC_HELP_STRING([--with-xdmscriptdir=<pathname>], + [specify directory for xdm scripts (default is same as xdmlibdir)]), + [XDMSCRIPTDIR="$withval"], [XDMSCRIPTDIR="${XDMLIBDIR}"]) +AC_SUBST(XDMSCRIPTDIR) + AC_ARG_WITH(logdir, AC_HELP_STRING([--with-logdir=<pathname>], [specify directory for xdm log files (default=/var/log)]), |