Changeset 1071

Timestamp:

Sep 9, 2011, 8:35:57 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Fixed documentation build.

File:

• packaging/qt.spec (modified) (1 diff)

packaging/qt.spec

@@ -388 +388 @@
 | sed -re 's,/@unixroot,$(UNIXROOT),g')
 
+BUILDDIR_D=$(echo "%{_builddir}/%{buildsubdir}" | sed -re 's,/,\\,g')
+
+# make sure the right DLLs are used by the build (and in particular by qdoc
+# in make install) in case if there is another Qt version installed
+export PATH="$BUILDDIR_D\\bin\;$PATH"
+export BEGINLIBPATH="$BUILDDIR_D\\bin\;$BEGINLIBPATH"
+
 cmd /c $QT_SOURCE_TREE_D\\configure.cmd $library_paths
+
+# qdoc needs the qsqlite plugin but nothing is installed to target locations
+# yet, so generate qt.conf to override paths
+echo \
+"[Paths]
+Prefix = ..
+Settings = \$(ETC)/xdg
+Examples = examples
+Demos = demos" \
+> "%{_builddir}/%{buildsubdir}/bin/qt.conf"
 
 make -j$MAKE_JOBS