diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | README | 21 | ||||
| -rw-r--r-- | config/Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | greeter/Makefile.am | 4 |
6 files changed, 63 insertions, 13 deletions
@@ -1,3 +1,16 @@ +2005-10-25 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + * Makefile.am: + * config/Makefile.am: + * greeter/Makefile.am: + Allow overriding directories for xdm scripts/modules & configuration + files via configure options --with-xdmlibdir & --with-xdmconfigdir + Add libXt and libX11 to dependencies for libXdmgreet. + + * README: + Document default directories & configure options to change them + 2005-10-25 Shawn Starr <shawn.starr@rogers.com> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 51ec234..7dc4558 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,8 +23,8 @@ SUBDIRS = config greeter bin_PROGRAMS = xdm xdmshell -xdmdir = $(libdir)/X11/xdm -xdm_PROGRAMS = chooser +xdmlibdir = $(XDMLIBDIR) +xdmlib_PROGRAMS = chooser # # xdm @@ -0,0 +1,21 @@ +The default installation settings of xdm match those used for most platforms +in the previous X.Org releases: + +Scripts & modules: $(libdir)/X11/xdm (aka $(prefix)/lib/X11/xdm) +Configuration files: $(libdir)/X11/xdm +Pixmap files: $(libdir)/X11/xdm/pixmaps +Log files: /var/log +Process id/lock files: /var/run + +These may be overridden with the following options to configure: +Scripts & modules: --with-xdmlibdir +Configuration files: --with-xdmconfigdir (or --with-xdmlibdir) +Pixmap files: --with-xdmpixmapdir (or --with-xdmlibdir) +Log files: --with-logdir +Process id/lock files: --with-piddir + +For instance, some packagers/sites may prefer: + --with-xdmconfigdir=/etc/X11/xdm --with-xdmlibdir=$(prefix)/lib/xdm + + +$Id$ diff --git a/config/Makefile.am b/config/Makefile.am index 88ebe63..eae6261 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,17 +3,18 @@ include $(top_srcdir)/cpprules.in -xdmdir = $(libdir)/X11/xdm +xdmlibdir = $(XDMLIBDIR) +xdmconfigdir = $(XDMCONFIGDIR) -dist_xdm_DATA = \ +dist_xdmconfig_DATA = \ Xaccess -xdm_DATA = \ +xdmconfig_DATA = \ xdm-config \ Xresources \ Xservers -dist_xdm_SCRIPTS = \ +dist_xdmlib_SCRIPTS = \ Xsession \ GiveConsole \ TakeConsole \ @@ -43,8 +44,9 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \ #endif CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \ - -DXDMDIR=$(xdmdir) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ - -DSU=$(SU) -DCHOOSERPATH=$(xdmdir)/chooser $(XPMDEFINES) + -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) \ + -DXDMPIDDIR=$(XDMPIDDIR) -DXDMCONFIGDIR=$(XDMCONFIGDIR) \ + -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) Xservers.ws: $(srcdir)/Xservers.ws.cpp $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/configure.ac b/configure.ac index 64e25e5..d0c9f1b 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,18 @@ AM_CONDITIONAL(HAS_ARC4_RANDOM, false) # Figure out where everything goes in the filesystem +AC_ARG_WITH(xdmlibdir, + AC_HELP_STRING([--with-xdmlibdir=<pathname>], + [specify directory for xdm scripts and modules (default=${libdir}/X11/xdm)]), + [XDMLIBDIR="$withval"], [XDMLIBDIR="${libdir}/X11/xdm"]) +AC_SUBST(XDMLIBDIR) + +AC_ARG_WITH(xdmconfigdir, + AC_HELP_STRING([--with-xdmconfigdir=<pathname>], + [specify directory for xdm config files (default is same as xdmlibdir)]), + [XDMCONFIGDIR="$withval"], [XDMCONFIGDIR="${XDMLIBDIR}"]) +AC_SUBST(XDMCONFIGDIR) + AC_ARG_WITH(logdir, AC_HELP_STRING([--with-logdir=<pathname>], [specify directory for xdm log files (default=/var/log)]), @@ -188,9 +200,9 @@ AC_ARG_WITH(bw-pixmap, [XDM_BWPIXMAP="$withval"], [XDM_BWPIXMAP="xorg-bw.xpm"]) AC_ARG_WITH(pixmapdir, AC_HELP_STRING([--with-pixmapdir=<pathname>], - [specify directory for xpm files (default=${libdir}/X11/xdm/pixmaps)]), + [specify directory for xpm files (default=xdmlibdir/pixmaps)]), [XDM_PIXMAPDIR="$withval"], - [XDM_PIXMAPDIR='${libdir}/X11/xdm/pixmaps']) + [XDM_PIXMAPDIR='${XDMLIBDIR}/pixmaps']) AC_SUBST(XDM_PIXMAP) AC_SUBST(XDM_BWPIXMAP) @@ -220,10 +232,12 @@ AC_SUBST(XDM_LIBS) # Greeter # +PKG_CHECK_MODULES(XDMGREET, xt x11) + XDMGREET_CFLAGS="$XDMGREET_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $OS_CFLAGS" XDMGREET_LIBS="$XDMGREET_LIBS $DMCP_LIBS" -GREETERLIB="${XDMDIR}/libXdmGreet.so" +GREETERLIB="${XDMLIBDIR}/libXdmGreet.so" AC_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library]) AC_SUBST(XDMGREET_CFLAGS) diff --git a/greeter/Makefile.am b/greeter/Makefile.am index f482601..9ff4d82 100644 --- a/greeter/Makefile.am +++ b/greeter/Makefile.am @@ -1,8 +1,8 @@ # $XdotOrg: app/xdm/greeter/Makefile.am,v $ -xdmdir = $(libdir)/X11/xdm +xdmlibdir = $(XDMLIBDIR) -xdm_LTLIBRARIES = libXdmGreet.la +xdmlib_LTLIBRARIES = libXdmGreet.la libXdmGreet_la_SOURCES = \ Login.c \ |