From 8817dcb8f43051d352c0caed6eebf29c6b0192b8 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 29 Oct 2013 23:18:50 +0100
Subject: l10ntools: remove Package_ulfconv

Change-Id: I7a8c3fdf34951e00fca8c0a2543f33817fa874fa
---
 l10ntools/Module_l10ntools.mk           |  4 ----
 l10ntools/Package_ulfconv.mk            | 16 ----------------
 solenv/bin/modules/installer/control.pm |  7 +++----
 solenv/bin/modules/installer/globals.pm |  2 +-
 4 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 l10ntools/Package_ulfconv.mk

diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 771e717c051f..979725296ee7 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -25,8 +25,4 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
     StaticLibrary_transex \
 ))
 
-$(eval $(call gb_Module_add_targets,l10ntools,\
-    Package_ulfconv \
-))
-
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk
deleted file mode 100644
index 18be8b410502..000000000000
--- a/l10ntools/Package_ulfconv.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv))
-
-$(eval $(call gb_Package_set_outdir,l10ntools_ulfconv,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 955158d06c49..6e81431a82fe 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -408,14 +408,13 @@ sub check_logfile
 sub read_lcidlist
 {
     my ($patharrayref) = @_;
-    my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::lcidlistname, $patharrayref , 0);
 
-    if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); }
+    if ( ! -f $installer::globals::lcidlistname ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); }
 
-    my $infoline = "Found LCID file: $$fileref\n";
+    my $infoline = "Found LCID file: $installer::globals::lcidlistname\n";
     push(@installer::globals::globallogfileinfo, $infoline);
 
-    my $lcidlist = installer::files::read_file($$fileref);
+    my $lcidlist = installer::files::read_file($installer::globals::lcidlistname);
     my %msilanguage = ();
 
     for ( my $i = 0; $i <= $#{$lcidlist}; $i++ )
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 29ca75d63afd..23b76d06afca 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -81,7 +81,7 @@ BEGIN
     $templatefoldername = "Templates";
     $programmenufolder = "ProgramMenuFolder";
     $systemfolder = "SystemFolder";
-    $lcidlistname = "msi-encodinglist.txt";
+    $lcidlistname = $ENV{'SRCDIR'} . "/l10ntools/source/ulfconv/msi-encodinglist.txt";
     $msilanguage = "";  # hash reference for msi languages LCID
     $sofficeiconadded = 0;
     $temppath = "";
-- 
cgit