summaryrefslogtreecommitdiff
path: root/tools/linux_packaging
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-05-24 16:59:58 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-05-24 16:59:58 +0000
commite195a2e379c73611db97bc1b2529df6297635d44 (patch)
tree60f7c4a2148f32d3caaa2354a95c8dc2ba349edd /tools/linux_packaging
parent95e092da71c2c39e7d0972be3fb92dae1c6b2d9d (diff)
more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12428 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/linux_packaging')
-rwxr-xr-xtools/linux_packaging/build11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 73a6b348c7..672b6f69a1 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -299,7 +299,16 @@ echo "Copying all GDK Pixbuf loaders ..."
cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
# charset alias file
-pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
+# Generate a pango module file using the actual Pango that we're going to bundle
+
+cat > pangorc <<EOF
+[Pango]
+ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules
+EOF
+env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules
+rm pangorc
+
+# Ditto for gdk-pixbuf loaders
gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
# We rely on clearlooks, so include a version from our own build tree