diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-17 00:40:28 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-17 00:40:28 +0000 |
| commit | 1afabc5f0a70fc32581b53eb978f06a30f58fefa (patch) | |
| tree | 22e0c886dd2b7228712243b24080abee399164a1 | |
| parent | 82d152fba78e1c34b62b426a7854efd0b116afdd (diff) | |
Put files in $(prefix)/lib/X11/xdm to match monolith install locations
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | config/Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 22 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index b307c8b..95e3e28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = config bin_PROGRAMS = xdm xdmshell -xdmdir = $(libdir)/xdm +xdmdir = $(libdir)/X11/xdm xdm_PROGRAMS = chooser # @@ -100,10 +100,16 @@ include $(top_srcdir)/cpprules.in XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -EXTRAMANDEFS = \ +MANDEFS = \ -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ - -DCHOOSERPATH=$(pkglibdir)/chooser -DXDMLOGDIR=$(XDMLOGDIR) \ - -DXDMDIR=$(pkglibdir) -DBINDIR=$(bindir) + -DCHOOSERPATH=$(xdmdir)/chooser -DXDMLOGDIR=$(XDMLOGDIR) \ + -DXDMDIR=$(xdmdir) -DBINDIR=$(bindir) \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ + -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ + -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ + -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) CPP_FILES_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) diff --git a/config/Makefile.am b/config/Makefile.am index c582bb5..88ebe63 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,15 +3,17 @@ include $(top_srcdir)/cpprules.in -dist_pkglib_DATA = \ +xdmdir = $(libdir)/X11/xdm + +dist_xdm_DATA = \ Xaccess -pkglib_DATA = \ +xdm_DATA = \ xdm-config \ Xresources \ Xservers -dist_pkglib_SCRIPTS = \ +dist_xdm_SCRIPTS = \ Xsession \ GiveConsole \ TakeConsole \ @@ -20,7 +22,7 @@ dist_pkglib_SCRIPTS = \ Xreset \ Xwilling -pixmapdir = $(pkglibdir)/pixmaps +pixmapdir = $(XDM_PIXMAPDIR) dist_pixmap_DATA = xorg-bw.xpm xorg.xpm @@ -41,8 +43,8 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \ #endif CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \ - -DXDMDIR=$(pkglibdir) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ - -DSU=$(SU) -DCHOOSERPATH=$(pkglibdir)/chooser $(XPMDEFINES) + -DXDMDIR=$(xdmdir) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ + -DSU=$(SU) -DCHOOSERPATH=$(xdmdir)/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 9de7afe..3cb2207 100644 --- a/configure.ac +++ b/configure.ac @@ -187,8 +187,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}/xdm/pixmaps)]), - [XDM_PIXMAPDIR="$withval"], [XDM_PIXMAPDIR='${libdir}/xdm/pixmaps']) + [specify directory for xpm files (default=${libdir}/X11/xdm/pixmaps)]), + [XDM_PIXMAPDIR="$withval"], + [XDM_PIXMAPDIR='${libdir}/X11/xdm/pixmaps']) AC_SUBST(XDM_PIXMAP) AC_SUBST(XDM_BWPIXMAP) @@ -225,6 +226,7 @@ CHOOSER_LIBS="$CHOOSER_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" AC_SUBST(CHOOSER_CFLAGS) AC_SUBST(CHOOSER_LIBS) +XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_OUTPUT([Makefile config/Makefile]) |