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 /config | |
| parent | 82d152fba78e1c34b62b426a7854efd0b116afdd (diff) | |
Put files in $(prefix)/lib/X11/xdm to match monolith install locations
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
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) > $@ |