diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-16 23:29:38 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-16 23:29:38 +0000 |
| commit | d8980cb7b6df64cf92c5b660f838497296dbb0bb (patch) | |
| tree | 2d7292126c30dd39a6cac338d441b4619a3bf13c | |
| parent | d731a249d0c1c7f9eb77828c0d6e79cfdaf75589 (diff) | |
x11perf/Makefile.am: xinit/Makefile.am: xvidtune/Makefile.am:
- Replace $< with portable macro xinit/Makefile.am: xinit/configure.ac:
xvidtune/Makefile.am: xvidtune/configure.ac:
- Use more portable cpp invocations for pre-processing files
xfs/configure.ac:
- Add XTRANS_CONNECTION_FLAGS so xtrans transport type defines are set
correctly
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 50903dd..414b166 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,10 +37,10 @@ dist_man_MANS = \ xinitrcdir = $(XINITDIR) xinitrc: xinitrc.cpp - $(SED) s/XINITDIR/`echo $(XINITDIR) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $< | $(SED) s/XCOMM/\#/ > $@ + $(SED) s/XINITDIR/`echo $(XINITDIR) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/xinitrc.cpp | $(SED) s/XCOMM/\#/ > $@ startx: startx.cpp Makefile - $(CPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $< | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $(srcdir)/startx.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ xinitrc_DATA = xinitrc diff --git a/configure.ac b/configure.ac index 2652ecf..005654a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,9 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) AC_PROG_CC +AC_PROG_CPP +AC_PATH_PROGS(RAWCPP, [cpp], [$(CPP)], + [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) AC_PROG_INSTALL AC_PATH_PROG(SED,sed) |