diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
| commit | 3f3a04b4f57b00141620da774ff9288685034c16 (patch) | |
| tree | a5bee03d031577d9ba86e87b2f3a7f3178cd8b0f /desktop | |
| parent | b82aed8e7f02baa2fd8e97ba4ec36833d0a035f9 (diff) | |
more merge fixes
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/prj/build.lst | 2 | ||||
| -rwxr-xr-x | desktop/prj/d.lst | 1 | ||||
| -rwxr-xr-x | desktop/source/deployment/registry/component/dp_component.cxx | 2 | ||||
| -rwxr-xr-x | desktop/zipintro/makefile.mk | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index a13732bc64c3..bef09600c23e 100755 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -37,8 +37,8 @@ dt desktop\source\deployment\registry\configuration nmake - all dt_dp_registry_c dt desktop\source\deployment\registry\help nmake - all dt_dp_registry_help dt_inc NULL dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_executable dt_inc NULL dt desktop\scripts nmake - u dt_scripts dt_inc NULL -dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL dt desktop\zipintro nmake - all dt_zipintro NULL +dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_zipintro NULL dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 442303258ff0..6c9f53824346 100755 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -109,6 +109,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms mkdir: %COMMON_DEST%\pck%_EXT%\brand mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev +..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip ..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip ..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip ..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck%_EXT%\shell.zip diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index ca23d0ec0520..323f8e5d3afd 100755 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -645,7 +645,7 @@ BackendImpl::BackendImpl( OUSTR("*.jar"), getResourceString(RID_STR_JAVA_TYPELIB), RID_IMG_JAVA_TYPELIB ) ), - m_typeInfos( 5 ) + m_typeInfos( 6 ) { m_typeInfos[ 0 ] = m_xDynComponentTypeInfo; m_typeInfos[ 1 ] = m_xJavaComponentTypeInfo; diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index cdc547fcc5c7..83a91ad3c2ba 100755 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -67,7 +67,7 @@ ZIP3DEPS=$(ZIP3LIST) .INCLUDE : target.mk ALLTAR : \ - $(COMMONBIN)$/brand$/intro.zip \ + $(COMMONBIN)$/intro.zip \ $(COMMONBIN)$/brand_dev$/intro.zip \ $(COMMONBIN)$/shell/shell.zip @@ -75,7 +75,7 @@ $(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ -$(COMMONBIN)$/brand$/intro.zip : $(COMMONBIN)$/brand.zip +$(COMMONBIN)$/intro.zip : $(COMMONBIN)$/brand.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ |