[libreoffice] 01/01: merge PACKAGE_TTF_OPENSYMBOL parts in install-indep

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit f9e801ff83b708ce76ef484654cb453dd3d202bc
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 17 00:02:08 2017 +0100

    merge PACKAGE_TTF_OPENSYMBOL parts in install-indep
---
 rules | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/rules b/rules
index b7568f6..778bc00 100755
--- a/rules
+++ b/rules
@@ -3035,6 +3035,15 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
 		debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
 	rm -rf $(PKGDIR)-common/$(OODIR)/share/fonts/truetype
+	mkdir -p debian/fonts-opensymbol/etc/fonts/conf.d
+	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+	# this only works with --without-fonts. Otherwise we get all stuff here,
+	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
+	# build here right now anyway.
+	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
+		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+        cd debian/fonts-opensymbol/etc/fonts.d/ && \
+                ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
 else
 	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
 endif
@@ -3223,18 +3232,6 @@ endif
 		ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
 	done
 
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
-	mkdir -p debian/fonts-opensymbol/etc/fonts/conf.d
-	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-	# this only works with --without-fonts. Otherwise we get all stuff here,
-	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
-	# build here right now anyway.
-	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
-		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-        cd debian/fonts-opensymbol/etc/fonts.d/ && \
-                ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
-endif
-
 	# register technical.dic
 	perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
 

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