mirror of
https://github.com/boostorg/boost_install.git
synced 2026-01-19 04:02:13 +00:00
Fix merge.
This commit is contained in:
@@ -1257,14 +1257,12 @@ rule boost-install ( libraries * )
|
||||
|
||||
if ! [ $(p).has-alternative-for-target install ]
|
||||
{
|
||||
local libdir = [ boost-install-dirs.libdir ] ;
|
||||
local bindir = [ boost-install-dirs.bindir ] ;
|
||||
|
||||
install install-libraries-static : $(libraries) : <location>(libdir) <install-dependencies>on <install-type>STATIC_LIB ;
|
||||
$(p).mark-target-as-explicit install-libraries-static ;
|
||||
|
||||
install install-libraries-shared- : $(libraries) : <location>$(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
|
||||
$(p).mark-target-as-explicit install-libraries-shared- ;
|
||||
alias install-libraries-shared : install-libraries-shared- ;
|
||||
alias install-libraries-shared : install-libraries-shared-cygwin : <target-os>cygwin ;
|
||||
$(p).mark-target-as-explicit install-libraries-shared ;
|
||||
|
||||
install install-libraries-shared- : $(libraries) : <location>(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
|
||||
$(p).mark-target-as-explicit install-libraries-shared- ;
|
||||
@@ -1272,6 +1270,9 @@ rule boost-install ( libraries * )
|
||||
install install-libraries-shared-cygwin : $(libraries) : <location>(bindir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
|
||||
$(p).mark-target-as-explicit install-libraries-shared-cygwin ;
|
||||
|
||||
install install-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB <conditional>@boost-install%install-subdir ;
|
||||
$(p).mark-target-as-explicit install-unprefixed-static ;
|
||||
|
||||
install install-unprefixed-shared : $(unprefixed) : <install-type>SHARED_LIB <install-no-version-symlinks>on <conditional>@boost-install%install-subdir ;
|
||||
$(p).mark-target-as-explicit install-unprefixed-shared ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user