Fix OBJECT_PREFIX and PRODUCT_NAME substitution

There were missing trailing '@' characters causing substitution to fail.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/include/version.hx b/include/version.hx
index ea1d0af048ca7bedfbfde997697a8c4345db0b17..bbf34b98e8dc4c1ed8e031f226e787385dedcb01 100644 (file)
--- a/include/version.hx
+++ b/include/version.hx
@@ -53,6 +53,6 @@
 #define DAY    @DAY@\r
 #define DAY_STR        "@DAY@"\r
 \r
-#define OBJECT_PREFIX_STR   "@OBJECT_PREFIX"\r
+#define OBJECT_PREFIX_STR   "@OBJECT_PREFIX@"\r
 #define OBJECT_GUID(_Name)  @OBJECT_PREFIX@ ## _Name ## _GUID\r
 \r

diff --git a/src/xeniface.inf b/src/xeniface.inf
index ad3304159d392d53bed75230cc113915364e41ac..4fb3edb1ccd5945ed9f9e05ec2a2027309b43d48 100644 (file)
--- a/src/xeniface.inf
+++ b/src/xeniface.inf
@@ -90,7 +90,7 @@ liteagent.exe = 1,,
 SPSVCINST_ASSOCSERVICE= 0x00000002\r
 Company= "@COMPANY_NAME@" \r
 DiskId1 = "@PRODUCT_NAME@ Interface Package"\r
-XenIfaceDevice.DeviceDesc = "@PRODUCT_NAME Interface"\r
+XenIfaceDevice.DeviceDesc = "@PRODUCT_NAME@ Interface"\r
 LITESVC_FLAGS= 0x00000800\r
-xenlite.SVCDESC= "@PRODUCT_NAME Interface Service"\r
+xenlite.SVCDESC= "@PRODUCT_NAME@ Interface Service"\r
 \r