diff options
| author | wlemb <wlemb> | 2004-04-07 17:45:59 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2004-04-07 17:45:59 +0000 |
| commit | 8ceee8e98c76d3ba7c8fffa753ea6cf9570d4f10 (patch) | |
| tree | c5d12743d6e6e3c1afdb641115c48db7de946c02 /Makefile.in | |
| parent | 5791884bd22828a08737aa34fb3924726b8209ba (diff) | |
| download | groff-8ceee8e98c76d3ba7c8fffa753ea6cf9570d4f10.tar.gz | |
Make scripts like nroff.sh and neqn.sh portable across various
(Unix-like) shell implementations from Cygwin, MSYS, etc., which use
non-POSIX path separators. The idea is to extend those scripts to
decide at run-time (of the script) which path separator to use.
* arch/misc/Makefile.sub: New file.
* arch/misc/shdeps.sh: New file, generating OS dependency fixups.
This script handles @GROFF_BIN_PATH_SETUP@, replacing it with
a proper definition of the variable `GROFF_RUNTIME'.
* Makefile.in (SH_DEPS_SED_SCRIPT): New variable.
(MDEFINES): Add SH_DEPS_SED_SCRIPT.
(PROGDEPDIRS): New variable.
`FORCE' it.
(PROGDIRS): Add PROGDEPDIRS.
* src/preproc/eqn/Makefile.sub (neqn): Call SH_DEPS_SED_SCRIPT.
Don't substitute @SEP@ and @BINDIR@.
* src/preproc/eqn/neqn.sh: Use @GROFF_BIN_PATH_SETUP@.
(PATH): Use GROFF_RUNTIME.
* src/roff/nroff/Makefile.sub (nroff): Call SH_DEPS_SED_SCRIPT.
Don't substitute @SEP@ and @BINDIR@.
* src/roff/nroff/nroff.sh: Use @GROFF_BIN_PATH_SETUP@.
(PATH): Use GROFF_RUNTIME.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 78501076..6b06de48 100644 --- a/Makefile.in +++ b/Makefile.in @@ -337,6 +337,8 @@ ETAGSCCFLAG=-C PERLPATH=@PERLPATH@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ +# Sed script to deal with OS dependencies in sh scripts. +SH_DEPS_SED_SCRIPT=$(top_builddir)/arch/misc/shdeps.sed # The program to create directory hierarchies. mkinstalldirs= $(SHELL) $(top_srcdir)/mkinstalldirs @@ -386,6 +388,7 @@ MDEFINES= \ "SH_SEP=$(SH_SEP)" \ "SHELL=$(SHELL)" \ "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \ + "SH_DEPS_SED_SCRIPT=$(SH_DEPS_SED_SCRIPT)" \ "TTYDEVDIRS=$(TTYDEVDIRS)" \ "YACC=$(YACC)" \ "YACCFLAGS=$(YACCFLAGS)" \ @@ -463,7 +466,8 @@ CCPROGDIRS=\ src/utils/lkbib \ src/utils/addftinfo CPROGDIRS=src/utils/pfbtops -PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS) +PROGDEPDIRS=arch/misc +PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) DEVDIRS=\ font/devps \ font/devdvi \ @@ -597,7 +601,7 @@ $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.dev $(do) -$(INCDIRS) $(OTHERDIRS): FORCE +$(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ |