summaryrefslogtreecommitdiff
path: root/scp2/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-06-02 15:38:28 +0200
committerMichael Stahl <mstahl@redhat.com>2017-06-02 16:34:53 +0200
commitfbed35762a6b14e8fda5179e320a9c30fd426454 (patch)
tree2b5ad65f478667d501bc5876df52dc9e67e9ac39 /scp2/inc
parent203c12c7ce5f54971755fb6fb2f04ec36e7797c4 (diff)
scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELIST
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
Diffstat (limited to 'scp2/inc')
-rw-r--r--scp2/inc/macros.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8825fdc55d79..d55084c8bcdb 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -115,7 +115,14 @@
#define PACKAGE_FILELIST(id,name) \
File id \
- Dir = PACKAGE_FILELIST_DIR; \
+ Dir = FILELIST_DIR; \
+ Name = name; \
+ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+End
+
+#define SDK_PACKAGE_FILELIST(id,name) \
+File id \
+ Dir = FILELIST_SDK_DIR; \
Name = name; \
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
End
@@ -502,10 +509,6 @@ End
#endif
#endif
-#if !defined PACKAGE_FILELIST_DIR
-#define PACKAGE_FILELIST_DIR FILELIST_DIR
-#endif
-
#define UI_FILELIST(name, file) \
File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
TXT_FILE_BODY; \