[Libreoffice-commits] .: RepositoryFixes.mk

[Michael Stahl]

 RepositoryFixes.mk |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 538fd2b16616ad8dabc2b409eec9a54d756ff4d5
Author: Michael Stahl <mst at openoffice.org>
Date:   Thu Sep 15 15:18:27 2011 +0200

    Repository.mk: fix conflicing filterconfig changes

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2b9b116..eb6a524 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -34,7 +34,6 @@
 ifneq (,$(filter SOLARIS GCC,$(OS) $(COM)))
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
@@ -47,7 +46,6 @@ endif
 
 ifeq ($(OS),WNT)
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLFILENAMES))