From c11971f1d7ad73fca5b2cff368e0c0438c2bd9f8 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 18 Jul 2008 11:41:08 +0000
Subject: #i91756# #i10000# installer fix

---
 scp2/source/onlineupdate/file_onlineupdate.scp   |  4 +---
 scp2/source/onlineupdate/module_onlineupdate.scp | 12 +-----------
 scp2/source/ooo/file_resource_ooo.scp            |  4 +++-
 scp2/source/ooo/module_lang_template.scp         |  5 +++--
 scp2/source/templates/makefile.mk                |  8 ++------
 5 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'scp2')

diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 4a9665d29dad..a42905f8fcaf 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: file_onlineupdate.scp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,8 +32,6 @@
 
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
-STD_RES_FILE( gid_File_Res_Upd, upd )
-
 File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index 4e7c649d8891..cb6d6e267b98 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: module_onlineupdate.scp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,13 +40,3 @@ Module gid_Module_Optional_Onlineupdate
     Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate);
     Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs);
 End
-
-Module gid_Module_Langpack_Onlineupdate_Template
-    ParentID = gid_Module_Optional_Onlineupdate;
-    Name = "gid_Module_Langpack_Onlineupdate_Template";
-    Description = "gid_Module_Langpack_Onlineupdate_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Upd);
-End
-
-#include "alllangmodules_onlineupdate.inc"
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 0ac1f9169f3c..00ce4f4f27d7 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: file_resource_ooo.scp,v $
- * $Revision: 1.65 $
+ * $Revision: 1.66 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -131,5 +131,7 @@ STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
 
 STD_RES_FILE( gid_File_Res_UpdChk, updchk )
 
+STD_RES_FILE( gid_File_Res_Upd, upd )
+
 STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
 
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 3ca75e3b9d48..cde974aa590c 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: module_lang_template.scp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -115,7 +115,8 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Egi,
              gid_File_Res_Ept,
              gid_File_Res_Eme,
-             gid_File_Res_UpdChk);
+             gid_File_Res_UpdChk,
+             gid_File_Res_Upd);
 End
 
 Module gid_Module_Langpack_Help_Template
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 9bc3a68f6e02..547873850426 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.6 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -44,7 +44,7 @@ TARGET=templates
 COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 .EXPORT : COMPLETELANGISO_VAR
 
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_onlineupdate.inc
+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
 
 .PHONY $(INCCOM)$/alllangmodules.inc:
     @@-$(RENAME) $@ $@.tmp
@@ -81,7 +81,3 @@ ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCC
 .PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
     @@-$(RENAME) $@ $@.tmp
     $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_onlineupdate.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_onlineupdate.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-- 
cgit v1.2.3