Changeset 828

Timestamp:

Nov 19, 2010, 12:20:47 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Set the system documentation path in the "Development" package rather than in "Documentation" because there may be other documentation besides Qt docs (and even if they are not installed) which needs a defined location.

Location:

packaging

Files:

• dev.wis.tpl (modified) (1 diff)
• doc.wis.tpl (modified) (1 diff)

packaging/dev.wis.tpl

@@ -35 +35 @@
      CREATEOBJECT="WPProgram|Qt4 Command Prompt|<QT4_FOLDER>|EXENAME=cmd.exe;PARAMETERS=/k $(2)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_CMD>;"
      CREATEOBJECT="WPProgram|Qt4 Command Prompt (4OS/2)|<QT4_FOLDER>|EXENAME=4os2.exe;PARAMETERS=/k $(2)\util\QtEnv.cmd;OBJECTID=<QT4_ENV_4OS2>;"
-     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers=$(2)/include,Libraries=$(2)/lib,Binaries=$(2)/bin,Data=$(2)"
-     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers,Libraries,Binaries"
+     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers=$(2)/include,Libraries=$(2)/lib,Binaries=$(2)/bin,Data=$(2)"
+     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Headers,Libraries,Binaries"
 >Contains Qt development libraries, C++ headers and tools. This package is required</PCK>
 

packaging/doc.wis.tpl

@@ -14 +14 @@
      TARGET="$(netlabs.org\Qt4\Development)\doc" FIXED
      LONGFILENAMES
-     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Documentation=$(1)"
-     DEEXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Documentation"
 >Contains the Qt reference documentation in QCH format. This package is recommended</PCK>