diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-01-16 18:44:38 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-17 05:22:24 +0100 |
| commit | 2009da99f38eb8f7571a505477202e126a6dd173 (patch) | |
| tree | 8bc0fe5bfced5da5ebc1982b2954e4ddc352afbf /scp2 | |
| parent | db741827e630518e40006cbf7486bead92820300 (diff) | |
Fix configurable branding.
Bin the submakefile, use direct Zip cp calls. This also fixes
the non-working deps towards default_images.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 04131ec2edae..730de98d4a1a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -63,8 +63,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Unopkgexe, gid_Brand_File_Bin_Unopkg, gid_Brand_File_Bin_Libxml2, - gid_Brand_File_Bmp_Shell, - gid_Brand_File_Bmp_IntroAbout, + gid_Brand_File_Bmp_IntroAboutShell, gid_Brand_File_C05_Zip_Faq, gid_Brand_File_C05_Zip_Register, gid_Brand_File_C05_Htm_Faq, @@ -652,7 +651,7 @@ File gid_Brand_File_Lib_Npsoplugin End #endif -File gid_Brand_File_Bmp_IntroAbout +File gid_Brand_File_Bmp_IntroAboutShell TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = "intro.zip"; @@ -666,13 +665,6 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End -File gid_Brand_File_Bmp_Shell - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program_Shell; - Name = "shell.zip"; - Styles = (ARCHIVE); -End - File gid_Brand_File_Txt_Package TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Extensions; |