Просмотр исходного кода

Enable rpmstuff and debstuff specific tokens

Can be useful in cases when Debian and RHEL/Fedora/... paths differ.
Alois Mahdal 7 лет назад
Родитель
Сommit
fdcf53e893
1 измененных файлов: 3 добавлений и 2 удалений
  1. 3
    2
      src/include/build.sh

+ 3
- 2
src/include/build.sh Просмотреть файл

@@ -28,6 +28,7 @@ _build1_ftype() {
28 28
         MKIT_COMMON)    _expand_tokens "tokens" ;;
29 29
         markdown)       _expand_includes | _expand_tokens "tokens" ;;
30 30
         rpmstuff)       _expand_tokens "tokens" "rpmstuff:tokens" ;;
31
+        debstuff)       _expand_tokens "tokens" "debstuff:tokens" ;;
31 32
         *)              die "unknown file type: $ftype" ;;
32 33
     esac
33 34
 }
@@ -188,7 +189,7 @@ debstuff() {
188 189
         do
189 190
             dftgt="debian/${dfsrc#$debian_skel}"
190 191
             mkdir -p "$(dirname "$dftgt")"
191
-            _build1 "$dfsrc" "$dftgt"
192
+            _build1 "$dfsrc" "$dftgt" debstuff
192 193
         done
193 194
     echo debian >> "$MKIT_LOCAL/built.lst"
194 195
 }
@@ -227,5 +228,5 @@ rpmstuff() {
227 228
     specsrc="$(ini 1value "dist:rpmstuff")"
228 229
     test -n "$specsrc" || die "dist:rpmstuff not specified"
229 230
     test -f "$specsrc" || die "specfile template not found: $specsrc"
230
-    _build1 "$specsrc" "$specname"
231
+    _build1 "$specsrc" "$specname" rpmstuff
231 232
 }