diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
| commit | b2eebed31eff3243c75726818ca0c7f2868e3182 (patch) | |
| tree | a12e0e4d3809e1d53d902d96c0003e4c310e5df6 /configure | |
| parent | 79f55cbf6c6e7412473e119a02aa637e985721f5 (diff) | |
| download | txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.gz txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.bz2 txr-b2eebed31eff3243c75726818ca0c7f2868e3182.zip | |
* Makefile (txr.o): Pass TXR_VER preprocessor symbol on gcc command
line.
(PREINSTALL): New variable holding a step for the install recipe.
(pax tar zip): New targets.
* configure (txr_ver): Version now added to config.make, passed
through to txr.c.
(gen_config_make): bindir, datadir and mandir are established
using gmake's regular macro assignment (=) rather than
expanding assignment (:=). This allows us to override the
prefix variable after configure time.
* lib.h (wli_noex): New macro.
(wli): Retarget to wli_noex, so that argument is subject
to macro replacement.
* txr.c (version): Use TXR_VER defined on compiler command line,
rather than hard-coded string literal.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -564,6 +564,8 @@ gen_config_make() # derived from the txr_shell variable. SHELL := $txr_shell +txr_ver := $txr_ver + # absolute path to source code directory top_srcdir := $top_srcdir @@ -581,13 +583,13 @@ DESTDIR := $install_prefix bindir_rel := $bindir # executable directory -bindir := \$(prefix)/\$(bindir_rel) +bindir = \$(prefix)/\$(bindir_rel) # read-only data directory -datadir := \$(prefix)/$datadir +datadir = \$(prefix)/$datadir # man page directory -mandir := \$(prefix)/$mandir +mandir = \$(prefix)/$mandir # cross compiler toolchain root directory cross := $cross |