diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-26 14:23:57 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-02-26 09:26:10 -0600 |
| commit | 872312d4bbea4d2fa6f8a3a1eb667e709085d54d (patch) | |
| tree | ddefdada5f99973f067fd284598df760aff4a070 /scp2/inc | |
| parent | eb35d71c2cb46d066b42be49b7749d96a647b50f (diff) | |
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)
(cherry picked from commit 482ab0d09620f92eb3618125930dc7c4c8335b5e)
Conflicts:
solenv/gbuild/AutoInstall.mk
fdo#75526: argh missing semicolon
(cherry picked from commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3)
Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
Reviewed-on: https://gerrit.libreoffice.org/8365
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
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 1ec649d652c6..d55c304a0393 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -165,6 +165,28 @@ 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); \ |