summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-10 12:07:31 +0100
committerMichael Stahl <mstahl@redhat.com>2014-01-10 12:10:21 +0100
commitae8e579515fff84cbef1ccc2da78fa769fb079ec (patch)
treeb9dbf73174dba019da8c147c1a8703d1845139e5 /scp2
parentdd8961ade2d221663eea695795428867ac38fe2d (diff)
scp2: fix windows build
913bf64b0bf1330a5055c26770faedf2ad7fc3c5 had some issues with redland stuff that is built as Library on windows, and the libxslt package is actually called "xslt" for unknown reasons; unfortunately the buildbot did not actually try to create an installation set so it was not detected. Change-Id: I0437f09228f62b21036a6c26e3d17029d1aab79e
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp20
1 files changed, 3 insertions, 17 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f9aa5c46816c..c90e28ab8132 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -275,23 +275,7 @@ File gid_File_Lib_Xslt
LIB_FILE_BODY;
Styles = (FILELIST);
Dir = FILELIST_DIR;
- Name = "libxslt.filelist";
-End
-File gid_File_Lib_eXslt
- PACKED_LIB_FILE_BODY;
- #ifdef UNX
- #ifdef MACOSX
- Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
- #else
- Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0));
- #endif
- #else
- #ifdef _gcc3
- Name = "libexslt-0.dll";
- #else
- Name = "libexslt.dll";
- #endif
- #endif
+ Name = "xslt.filelist";
End
#endif
@@ -369,6 +353,7 @@ End
#endif
#ifndef SYSTEM_REDLAND
+#ifndef WNT
File gid_File_Lib_Raptor
LIB_FILE_BODY;
Styles = (FILELIST);
@@ -389,5 +374,6 @@ File gid_File_Lib_Rdf
Dir = FILELIST_DIR;
Name = "redland.filelist";
End
+#endif // WNT
#endif // SYSTEM_REDLAND