[lmi-commits] [lmi] valyuta/004 d4180d4 3/3: Un-rebase-able fixup

[Greg Chicares]

branch: valyuta/004
commit d4180d4281cc0889d622d79ec12daa6c9ed440ea
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Un-rebase-able fixup
    
    This fixes a mistake in commit 48ec029bea: 'GNUmakefile' was copied in
    its entirety, not preserving an important 'touchstone_dir' difference.
    Ideally the mistake would be vaporized via 'git rebase --interactive',
    but apparently that can't be done across a merge: attempting even just
    to move it immediately after 48ec029bea causes a conflict in unrelated
    file 'ihs_server7702.cpp'.
---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index f08c70e..4733c17 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -142,7 +142,7 @@ localbindir     := 
$(prefix)/local/$(LMI_COMPILER)_$(LMI_TRIPLET)/bin
 locallibdir     := $(prefix)/local/$(LMI_COMPILER)_$(LMI_TRIPLET)/lib
 localincludedir := $(prefix)/local/include
 test_dir        := $(prefix)/test
-touchstone_dir  := $(prefix)/touchstone
+touchstone_dir  := $(prefix)/test_valyuta
 
 
################################################################################