summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorDan Nicholson <[email protected]>2009-05-22 09:39:02 -0700
committerDan Nicholson <[email protected]>2009-06-01 06:32:52 -0700
commitbc302b2a33ceffe454bcf443daa0ac1edc118e9b (patch)
treeb3ef47e16a5479963a12bf2585cadfa54539d035 /configs
parent85e0572756b85b7025740fbbefb673cf75a46cea (diff)
Use separate $(MINSTALL) for installing libraries
The special feature of bin/minstall to copy symlinks is only ever needed when installing libraries which may have .so symlinks. All the headers and directories can use a normal install program. These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the user (or autoconf) to override installing normal files as they please. An autoconf check for the install program has been added and will be used in preference to minstall when available. Fixes bug 16053.
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in1
-rw-r--r--configs/default5
2 files changed, 5 insertions, 1 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index b61d7f33f00..77422e3fe5a 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -31,6 +31,7 @@ SHELL = @SHELL@
MKLIB_OPTIONS = @MKLIB_OPTIONS@
MKDEP = @MKDEP@
MKDEP_OPTIONS = @MKDEP_OPTIONS@
+INSTALL = @INSTALL@
# Python and flags (generally only needed by the developers)
PYTHON2 = python
diff --git a/configs/default b/configs/default
index d2ea3b24876..dc28be37ddf 100644
--- a/configs/default
+++ b/configs/default
@@ -36,7 +36,10 @@ MKLIB_OPTIONS =
MKDEP = makedepend
MKDEP_OPTIONS = -fdepend
MAKE = make
-INSTALL = $(SHELL) $(TOP)/bin/minstall
+
+# Use MINSTALL for installing libraries, INSTALL for everything else
+MINSTALL = $(SHELL) $(TOP)/bin/minstall
+INSTALL = $(MINSTALL)
# Tools for regenerating glapi (generally only needed by the developers)
PYTHON2 = python