[lmi-commits] [lmi] master 1f46780 3/7: Add an include directory for architecture-dependent packages

[Greg Chicares]

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

    Add an include directory for architecture-dependent packages
    
    Third-party packages built from source and installed to an architecture-
    dependent directory may place their headers there, e.g., in an include/
    subdirectory. They might also write an architecture-appropriate config
    header in that subdirectory.
---
 GNUmakefile | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 6cb18d9..893f5f4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -84,44 +84,45 @@ MAKEFLAGS := \
 # more closely, changing the value of $(datadir), and perhaps using
 # some other standard directories that are commented out for now.
 
-prefix         := /opt/lmi
+prefix          := /opt/lmi
 # parent directory for machine-specific binaries
-exec_prefix    := $(prefix)
+exec_prefix     := $(prefix)
 # binaries that users can run
-bindir         := $(exec_prefix)/bin
+bindir          := $(exec_prefix)/bin
 # binaries that administrators can run
-#sbindir        := $(exec_prefix)/sbin
+#sbindir         := $(exec_prefix)/sbin
 # binaries run by programs
-#libexecdir     := $(exec_prefix)/libexec
+#libexecdir      := $(exec_prefix)/libexec
 # parent directory for read-only architecture-independent data files
-datarootdir    := $(prefix)/share
+datarootdir     := $(prefix)/share
 # idiosyncratic read-only architecture-independent data files
 # GNU standard default:
-# datadir        := $(datarootdir)
+# datadir         := $(datarootdir)
 # nonstandard value used for now:
-datadir        := $(exec_prefix)/data
+datadir         := $(exec_prefix)/data
 # read-only data files that pertain to a single machine
-#sysconfdir     := $(prefix)/etc
+#sysconfdir      := $(prefix)/etc
 # architecture-independent data files which the programs modify while they run
-#sharedstatedir := $(prefix)/com
+#sharedstatedir  := $(prefix)/com
 # data files which the programs modify while they run
-#localstatedir  := $(prefix)/var
+#localstatedir   := $(prefix)/var
 # data files which the programs modify while they run, persisting until reboot
-#runstatedir    := $(localstatedir)/run
+#runstatedir     := $(localstatedir)/run
 # headers
-#includedir     := $(prefix)/include
-docdir         := $(datarootdir)/doc/lmi
-htmldir        := $(docdir)
-#libdir         := $(exec_prefix)/lib
+#includedir      := $(prefix)/include
+docdir          := $(datarootdir)/doc/lmi
+htmldir         := $(docdir)
+#libdir          := $(exec_prefix)/lib
 # source files (GNU Coding Standards don't suggest any default value)
-srcdir         := $(CURDIR)
+srcdir          := $(CURDIR)
 
 # These directories are outside the scope of the GNU Coding Standards.
 # Therefore, their names may contain '_' for distinction and clarity.
-localbindir    := $(exec_prefix)/local/bin
-locallibdir    := $(exec_prefix)/local/lib
-test_dir       := $(exec_prefix)/test
-touchstone_dir := $(exec_prefix)/touchstone
+localbindir     := $(exec_prefix)/local/bin
+locallibdir     := $(exec_prefix)/local/lib
+localincludedir := $(exec_prefix)/local/include
+test_dir        := $(exec_prefix)/test
+touchstone_dir  := $(exec_prefix)/touchstone
 
 
################################################################################
 
@@ -202,6 +203,7 @@ MAKETARGET = \
                           srcdir='$(srcdir)' \
                      localbindir='$(localbindir)' \
                      locallibdir='$(locallibdir)' \
+                 localincludedir='$(localincludedir)' \
                         test_dir='$(test_dir)' \
                   touchstone_dir='$(touchstone_dir)' \
                          toolset='$(toolset)' \