summaryrefslogtreecommitdiff
path: root/Makefile.builds.in
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2012-10-24 22:24:34 +0000
committerMorgan Deters <mdeters@gmail.com>2012-10-24 22:24:34 +0000
commit9c6f99513f27404fdd596217f3a438aee155851e (patch)
treed0da998e9f7fc72141a0db6ab3af18962afa1c3c /Makefile.builds.in
parenta6ac7fefed613c4d83e577361f98c28a8e18f3a9 (diff)
Includes many fixes to build system for Solaris (thanks Tim!), and also
just in general, and some documentation adjustments.
Diffstat (limited to 'Makefile.builds.in')
-rw-r--r--Makefile.builds.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.builds.in b/Makefile.builds.in
index baf9237b2..274e2c9e7 100644
--- a/Makefile.builds.in
+++ b/Makefile.builds.in
@@ -60,11 +60,11 @@ AM_V_mkdir = $(am__v_mkdir_$(V))
am__v_mkdir_ = $(am__v_mkdir_$(AM_DEFAULT_VERBOSITY))
am__v_mkdir_0 = @$(am__v_mkdir_noat_0)
am__v_mkdir_1 = $(am__v_mkdir_noat_1)
-# libtool --mode=install install
+# libtool --mode=install $(install_sh)
AM_V_ltinstall = $(am__v_ltinstall_$(V))
am__v_ltinstall_ = $(am__v_ltinstall_$(AM_DEFAULT_VERBOSITY))
-am__v_ltinstall_0 = @$(SHELL) -c 'echo " LTINS $$1"; $(LIBTOOL) --silent --mode=install install "$$@"' bash
-am__v_ltinstall_1 = $(LIBTOOL) --mode=install install
+am__v_ltinstall_0 = @$(SHELL) -c 'echo " LTINS $$1"; $(LIBTOOL) --silent --mode=install $(install_sh) "$$@"' bash
+am__v_ltinstall_1 = $(LIBTOOL) --mode=install $(install_sh)
# install_sh (never prefix with @)
AM_V_install_sh_noat = $(am__v_install_sh_noat_$(V))
am__v_install_sh_noat_ = $(am__v_install_sh_noat_$(AM_DEFAULT_VERBOSITY))
@@ -98,7 +98,7 @@ all:
"$(abs_builddir)$(libdir)"
ifeq ($(CVC4_BUILD_LIBCOMPAT),yes)
# install libcvc4compat
- $(CURRENT_BUILD)/libtool --mode=install install -v \
+ $(CURRENT_BUILD)/libtool --mode=install $(install_sh) \
$(CURRENT_BUILD)/src/compat/libcvc4compat.la \
"$(abs_builddir)$(libdir)"
endif
@@ -148,7 +148,7 @@ endif
$(AM_V_ltinstall) $(CURRENT_BUILD)/src/parser/libcvc4parser.la "`pwd`$(libdir)"
ifeq ($(CVC4_BUILD_LIBCOMPAT),yes)
# install libcvc4compat
- $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/compat/libcvc4compat.la "`pwd`$(libdir)"
+ $(CURRENT_BUILD)/libtool --mode=install $(install_sh) $(CURRENT_BUILD)/src/compat/libcvc4compat.la "`pwd`$(libdir)"
endif
ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10)
# if we're building shared libs and the binary is not static, relink
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback