Browse Source

Don't always add LICENSE.md to dist.tarball

Alois Mahdal 7 years ago
parent
commit
834dc80d9f
2 changed files with 3 additions and 2 deletions
  1. 1
    0
      src/include/build.sh
  2. 2
    2
      src/newstub

+ 1
- 0
src/include/build.sh View File

81
         done
81
         done
82
         echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name | _qfs)|g;"
82
         echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name | _qfs)|g;"
83
         echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename | _qfs)|g;"
83
         echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename | _qfs)|g;"
84
+        echo "s|__MKIT_PROJ_LICENSE__|$(ini 1value project:license | _qfs)|g;"
84
         echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname | _qfs)|g;"
85
         echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname | _qfs)|g;"
85
         echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline | _qfs)|g;"
86
         echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline | _qfs)|g;"
86
         echo "s|__MKIT_PROJ_MAINTAINER__|$(ini 1value project:maintainer | _qfs)|g;"
87
         echo "s|__MKIT_PROJ_MAINTAINER__|$(ini 1value project:maintainer | _qfs)|g;"

+ 2
- 2
src/newstub View File

75
             test -n "$RelDst"       && echo "    reldst      = $RelDst"
75
             test -n "$RelDst"       && echo "    reldst      = $RelDst"
76
             echo ""
76
             echo ""
77
             echo "[dist]"
77
             echo "[dist]"
78
-            echo "    tarball = LICENSE.md"
78
+            $MkLicense  && echo "    tarball = LICENSE.md"
79
             $MkMakefile && echo "    tarball = Makefile"
79
             $MkMakefile && echo "    tarball = Makefile"
80
             $MkReadme   && echo "    tarball = README.md"
80
             $MkReadme   && echo "    tarball = README.md"
81
             echo "    tarball = mkit.ini"
81
             echo "    tarball = mkit.ini"
563
     esac done
563
     esac done
564
     PackageName="$1"
564
     PackageName="$1"
565
     test -n "$PackageName" || usage
565
     test -n "$PackageName" || usage
566
-    if test -n "$License"; then
566
+    if $MkLicense; then
567
         known_licenses | grep -qxF "$License" \
567
         known_licenses | grep -qxF "$License" \
568
          || die "unknown license (use -L to get list): $License"
568
          || die "unknown license (use -L to get list): $License"
569
         MkLicense=true
569
         MkLicense=true