Only copy necessary config files to package directory

Also use -L flag so files are actually copied and not linked

diff --git a/tools/windows_packaging/copydll-fedora.sh b/tools/windows_packaging/copydll-fedora.sh
index dcfbc41ac68e2bc57beac5411f84cd9cad3227e4..8ba3c0fb5c8433731f7091e805803c401bac8acc 100755 (executable)
--- a/tools/windows_packaging/copydll-fedora.sh
+++ b/tools/windows_packaging/copydll-fedora.sh
@@ -2,7 +2,6 @@
 
 function copydll () {
        if [ -f $MINGW_ROOT/bin/$1 ] ; then
-               echo "cp $MINGW_ROOT/bin/$1 $2"
                cp $MINGW_ROOT/bin/$1 $2 || return 1
                return 0
        fi

diff --git a/tools/windows_packaging/package.sh b/tools/windows_packaging/package.sh
index c6ad13c42b0c92d9fe1731286c8b2fed3a3b5ede..6a8b394aaf5d2a5533bd3bd939fb1768656422fa 100755 (executable)
--- a/tools/windows_packaging/package.sh
+++ b/tools/windows_packaging/package.sh
@@ -47,12 +47,14 @@ if test x$WITH_TESTS != x ; then
        cp -r $BASE/libs/ardour/test/data $PACKAGE_DIR/ardour_testdata
 fi
 
-echo "Copying mingw config files to $PACKAGE_DIR ..."
-# just copy it all for now
-cp -r $MINGW_ROOT/etc $PACKAGE_DIR
-
-cp -r $MINGW_ROOT/lib/gtk-2.0 $PACKAGE_DIR/lib
-cp -r $MINGW_ROOT/lib/gdk-pixbuf-2.0 $PACKAGE_DIR/lib
+echo "Copying config files to $PACKAGE_DIR ..."
+mkdir -p $PACKAGE_DIR/etc
+cp -RL $MINGW_ROOT/etc/fonts $PACKAGE_DIR/etc
+cp -RL $MINGW_ROOT/etc/gtk-2.0 $PACKAGE_DIR/etc
+cp -RL $MINGW_ROOT/etc/pango $PACKAGE_DIR/etc
+
+cp -R $MINGW_ROOT/lib/gtk-2.0 $PACKAGE_DIR/lib
+cp -R $MINGW_ROOT/lib/gdk-pixbuf-2.0 $PACKAGE_DIR/lib
 cp $TOOLS_DIR/loaders.cache $PACKAGE_DIR/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
 if test x$WITH_PANGO_1_6 != x; then