|
@@ -82,7 +82,7 @@ deploy() {
|
82
|
82
|
remake_section dist
|
83
|
83
|
remake_section ENV
|
84
|
84
|
remake_section roots
|
85
|
|
- remake_section tokens
|
|
85
|
+ remake_section macros
|
86
|
86
|
remake_section modes
|
87
|
87
|
remake_section files
|
88
|
88
|
else
|
|
@@ -112,7 +112,7 @@ deploy() {
|
112
|
112
|
echo "doc = [ENV:PREFIX]/share/doc/$PackageName"
|
113
|
113
|
} | reformat_section
|
114
|
114
|
echo ""
|
115
|
|
- echo "[tokens]"
|
|
115
|
+ echo "[macros]"
|
116
|
116
|
{
|
117
|
117
|
echo "__${PackageName^^}_FOO__ = Barr.."
|
118
|
118
|
} | reformat_section
|
|
@@ -258,7 +258,7 @@ deploy() {
|
258
|
258
|
echo " machine should be uder 'src'."
|
259
|
259
|
echo ""
|
260
|
260
|
echo " Note that during build time, files named ending with"
|
261
|
|
- echo " '.skel' are subject to token expansion, see mkit.ini"
|
|
261
|
+ echo " '.skel' are subject to macro expansion, see mkit.ini"
|
262
|
262
|
echo " section below for details."
|
263
|
263
|
echo ""
|
264
|
264
|
echo " * *notes* directory - here you shall store notes"
|
|
@@ -279,7 +279,7 @@ deploy() {
|
279
|
279
|
echo " * *packaging* directory contains templates that enable"
|
280
|
280
|
echo " MKit create raw stuffs used to create DEB or RPM"
|
281
|
281
|
echo " packages. Similar to '.skel' files in 'src', all files"
|
282
|
|
- echo " here are automatically considered for token expansion,"
|
|
282
|
+ echo " here are automatically considered for macro expansion,"
|
283
|
283
|
echo " no matter how they are named (see mkit.ini section"
|
284
|
284
|
echo " below)."
|
285
|
285
|
echo ""
|
|
@@ -382,13 +382,13 @@ deploy() {
|
382
|
382
|
echo " \`[modes]\` section is your friend. Permissions here"
|
383
|
383
|
echo " should be in UNIX octal format."
|
384
|
384
|
echo ""
|
385
|
|
- echo " 5. Next, \`[tokens]\` section allows you to define own"
|
|
385
|
+ echo " 5. Next, \`[macros]\` section allows you to define own"
|
386
|
386
|
echo " placeholders that will be replaced when your scripts are"
|
387
|
387
|
echo " built. Each file in 'src' directory that is named with"
|
388
|
388
|
echo " '.skel' suffix, and each file from 'packaging' directory"
|
389
|
|
- echo " (no matter its name), can contain one or more of tokens"
|
390
|
|
- echo " defined here, plus range of tokens automatically defined"
|
391
|
|
- echo " by MKit. During build, these tokens are replaced with"
|
|
389
|
+ echo " (no matter its name), can contain one or more of macros"
|
|
390
|
+ echo " defined here, plus range of macros automatically defined"
|
|
391
|
+ echo " by MKit. During build, these macros are replaced with"
|
392
|
392
|
echo " their actual values."
|
393
|
393
|
echo ""
|
394
|
394
|
echo " 6. Less interesting, but important section is \`[dist]\`,"
|