[libreoffice] 01/03: fix firebird 3.0 share stuff install

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit ab57f37975da6baee8ab8ce450b9f76b49b26c8e
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 11 01:16:44 2016 +0200

    fix firebird 3.0 share stuff install
---
 rules | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rules b/rules
index 2a87ffa..79c2080 100755
--- a/rules
+++ b/rules
@@ -2338,6 +2338,14 @@ endif
 	# share/uno_packages/cache...
 	rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
 
+ifeq "$(ENABLE_FIREBIRD)" "y"
+  ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
+	mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share
+	mv $(PKGDIR)-common/$(OODIR)/share/firebird \
+		$(PKGDIR)-sdbc-firebird/$(OODIR)/share
+  endif
+endif
+
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
 	touch $@
@@ -2703,11 +2711,6 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
 		mv $(PKGDIR)-core/$(OODIR)/program/$$i \
 			$(PKGDIR)-sdbc-firebird/$(OODIR)/program; \
 	done
-	mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share/firebird
-	for i in firebird.msg security3.fdb; do \
-		mv $(PKGDIR)-core/$(OODIR)/share/$$i \
-			 $(PKGDIR)-sdbc-firebird/$(OODIR)/share/firebird; \
-	done	 
   endif
 endif
 	mkdir -p $(PKGDIR)-base-drivers/$(OODIR)/program

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git