2014-06-10 Kaz Kylheku <kaz@kylheku.com>

* Makefile (PROG): Removing ./ prefix from variable name; adding it
to invocations of $(PROG) in some rules.
(txr.o): Pass several strings as macros on the command line:
TXR_REL_PATH, EXE_SUFF and PROG_NAME.

* configure (bindir, datadir, mandir): These variables become
just relative paths from the prefix.

* txr.c (sysroot): Use the TXR_REL_PATH, EXE_SUFF and PROG_NAME
preprocessor symbols defined on the command line to avoid
hard-coding strings like "bin/txr" and "bin/txr.exe" which
actually should reflect the value of the bindir variable.

1 files changed, 4 insertions, 4 deletions

diff --git a/txr.c b/txr.c
index 22bc8c4d..d46a2d67 100644
--- a/txr.c
+++ b/txr.c
@@ -217,10 +217,10 @@ static val sysroot_helper(val exepart, val target)
 static val sysroot(val target)
 {
   uses_or2;
-  return or4(sysroot_helper(lit("bin/txr"), target),
-             sysroot_helper(lit("bin/txr.exe"), target),
-             sysroot_helper(lit("txr"), target),
-             sysroot_helper(lit("txr.exe"), target));
+  return or4(sysroot_helper(lit(TXR_REL_PATH), target),
+             sysroot_helper(lit(TXR_REL_PATH EXE_SUFF), target),
+             sysroot_helper(lit(PROG_NAME), target),
+             sysroot_helper(lit(PROG_NAME EXE_SUFF), target));
 }
 
 static void sysroot_init(void)