diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-10 04:25:39 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-10 04:25:39 +0000 |
| commit | 277975ec73744657e556a0c6380614d8684db7df (patch) | |
| tree | 465503c121858ce59f6aaf1aa6331d4462d7245e /Makefile.am | |
| parent | 6e7bcf4f2ea8bb868ed8b0459f1c0d6cc172f4ae (diff) | |
Add settings for SHELL_CMD & ARCHMANDEFS to match monolith changes for bugXORG-6_99_99_902
#3180.
AC_DEFINE(XORG,...) so it is listed as available server in xinit help
output.
Update cpp -D flags to match monolith changes for bug #3180.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 132a2c8..26f0c0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,8 @@ MANDEFS = \ -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \ - -D__xinitdir__=$(XINITDIR) + -D__xinitdir__=$(XINITDIR) \ + -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) SUFFIXES = .$(APP_MAN_SUFFIX) .man @@ -72,11 +73,15 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man xinitrcdir = $(XINITDIR) +SCRIPTDEFS = \ + -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \ + -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) + xinitrc: xinitrc.cpp - $(RAWCPP) -DXINITDIR=$(XINITDIR) < $(srcdir)/xinitrc.cpp | $(CPP_SED_MAGIC) > $@ + $(RAWCPP) $(SCRIPTDEFS) < $(srcdir)/xinitrc.cpp | $(CPP_SED_MAGIC) > $@ startx: startx.cpp Makefile - $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $(STARTX_COOKIE_FLAGS) $(srcdir)/startx.cpp | $(CPP_SED_MAGIC) > $@ + $(RAWCPP) $(SCRIPTDEFS) < $(srcdir)/startx.cpp | $(CPP_SED_MAGIC) > $@ xinitrc_DATA = xinitrc |