diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-02-26 14:23:57 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-26 14:27:49 +0100 |
commit | 482ab0d09620f92eb3618125930dc7c4c8335b5e (patch) | |
tree | 150ddffadff6a64981341dd95a0d38679fe1d054 /scp2/inc | |
parent | Remove visual noise from ucbhelper (diff) | |
download | core-482ab0d09620f92eb3618125930dc7c4c8335b5e.tar.gz core-482ab0d09620f92eb3618125930dc7c4c8335b5e.zip |
fdo#75526: sdk: install URE library symlinks / import libs again
This is a bit involved because since the LinkTarget now creates the
instdir/sdk/lib/* files itself a Package cannot be used; so convert the
URE libraries to AutoInstall and add special handling for them to
gb_Helper_register_libraries_for_install to create the necessary links
in the "sdk" install-module.
(regression from 70c35265f517ef372cb739d4cc64499abf57a838)
Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
Diffstat (limited to 'scp2/inc')
-rwxr-xr-x | scp2/inc/macros.inc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 9266bb56e3e7..0fc98a36add5 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -172,6 +172,28 @@ End ComponentCondition = cond; \ End +#ifdef MACOSX +// links are craeted at configure time by odk/config/setsdkenv_unix.sh.in +#define SDK_LIBRARY_LINK(id,name,target) +#elif defined(WNT) +#define SDK_LIBRARY_LINK(id,name,target) \ + File id \ + TXT_FILE_BODY; \ + Styles = (PACKED); \ + Dir = gid_Dir_Lib_Sdk; \ + Name = name \ + End +#else +#define SDK_LIBRARY_LINK(id,name,target) \ + Unixlink id \ + BIN_FILE_BODY; \ + Styles = (); \ + Dir = gid_Dir_Lib_Sdk; \ + Name = name; \ + Target = target; \ + End +#endif + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ |