[lmi-commits] [lmi] master dc3854e 5/7: Replace literal '/opt/lmi/local' with makefile variables set OAOO

[Greg Chicares]

branch: master
commit dc3854e70d0cd7fd5318f985cbdc4c36c77eee0d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Replace literal '/opt/lmi/local' with makefile variables set OAOO
    
    Exceptions:
    * como.make: extremely obsolete
    * install_libxml2_libxslt.make: a script masquerading as a makefile
---
 GNUmakefile      |  2 +-
 msw_cygwin.make  |  2 +-
 msw_generic.make |  2 +-
 workhorse.make   | 23 ++++++++++-------------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 893f5f4..35723a8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -355,7 +355,7 @@ TEST_CODING_RULES := 
$(build_directory)/test_coding_rules$(EXEEXT)
 .PHONY: custom_tools
 custom_tools:
        @$(MAKE) --file=$(this_makefile) --directory=$(srcdir) 
test_coding_rules$(EXEEXT)
-       @$(CP) --preserve --update $(TEST_CODING_RULES) /opt/lmi/local/bin
+       @$(CP) --preserve --update $(TEST_CODING_RULES) $(localbindir)
 
 
################################################################################
 
diff --git a/msw_cygwin.make b/msw_cygwin.make
index c148ac1..2539fb0 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -118,7 +118,7 @@ WGET    := wget
 # Instead of requiring installation of the build system's own libxml2:
 #   XMLLINT := xmllint
 # use the one that lmi builds:
-XMLLINT := /opt/lmi/local/bin/xmllint
+XMLLINT := $(localbindir)/xmllint
 
 
################################################################################
 
diff --git a/msw_generic.make b/msw_generic.make
index 156f67e..1a86df2 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -111,7 +111,7 @@ WGET    := wget
 # Instead of requiring installation of the build system's own libxml2:
     XMLLINT := xmllint
 # use the one that lmi builds:
-#   XMLLINT := $(PERFORM) /opt/lmi/local/bin/xmllint
+#   XMLLINT := $(PERFORM) $(localbindir)/xmllint
 # but don't do that until 'wine' is fixed--see:
 #   https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
 
diff --git a/workhorse.make b/workhorse.make
index 388528a..7d8a50e 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -170,7 +170,7 @@ endif
 
 # wx settings.
 
-wx_dir := /opt/lmi/local/bin
+wx_dir := $(localbindir)
 
 wx_config_script := wx-config
 
@@ -281,8 +281,7 @@ wx_config_check:
 # For msw at least, these libraries are somewhat arbitrarily placed in
 #   /opt/lmi/third_party/
 # while properly autotoolized libraries are installed in
-#   /opt/lmi/local/
-# ; see:
+# $(locallibdir) and $(localbindir); see:
 #   http://lists.gnu.org/archive/html/lmi/2006-10/msg00046.html
 # for some discussion.
 
@@ -294,8 +293,8 @@ all_include_directories := \
   $(wx_include_paths) \
   /opt/lmi/third_party/include \
   /opt/lmi/third_party/src \
-  /opt/lmi/local/include \
-  /opt/lmi/local/include/libxml2 \
+  $(localincludedir) \
+  $(localincludedir)/libxml2 \
 
 all_source_directories := \
   $(srcdir) \
@@ -863,9 +862,7 @@ REQUIRED_ARFLAGS = \
 # specified in $(LIBS). Thus, a distinct variable is necessary for
 # path overrides, so distinct variables are necessary.
 
-# Two subdirectories of /opt/lmi/local/
-#   /opt/lmi/local/lib
-#   /opt/lmi/local/bin
+# Architecture-specific directories $(locallibdir) and $(localbindir)
 # are placed on the link path in order to accommodate msw dlls, for
 # which no canonical location is clearly specified by FHS, because
 # they're both binaries and libraries in a sense. These two
@@ -881,8 +878,8 @@ REQUIRED_ARFLAGS = \
 all_library_directories := \
   . \
   $(overriding_library_directories) \
-  /opt/lmi/local/lib \
-  /opt/lmi/local/bin \
+  $(locallibdir) \
+  $(localbindir) \
 
 EXTRA_LDFLAGS :=
 
@@ -1044,7 +1041,7 @@ help_files := \
 .PHONY: preinstall
 preinstall:
        @[ -z "$(compiler_runtime_files)" ] \
-         || $(CP) --preserve --update $(compiler_runtime_files) 
/opt/lmi/local/bin
+         || $(CP) --preserve --update $(compiler_runtime_files) $(localbindir)
 
 .PHONY: install
 install: preinstall $(default_targets)
@@ -1136,8 +1133,8 @@ fardel_binaries := \
   $(bindir)/skeleton$(SHREXT) \
   $(bindir)/wx_new$(SHREXT) \
   $(bindir)/wx_test$(EXEEXT) \
-  $(wildcard $(prefix)/local/bin/*$(SHREXT)) \
-  $(wildcard $(prefix)/local/lib/*$(SHREXT)) \
+  $(wildcard $(localbindir)/*$(SHREXT)) \
+  $(wildcard $(locallibdir)/*$(SHREXT)) \
   $(wildcard $(bindir)/product_files$(EXEEXT)) \
   $(extra_fardel_binaries) \