|
@@ -47,7 +47,7 @@ deploy() {
|
47
|
47
|
echo -n "# $any_name"
|
48
|
48
|
test -n "$Tagline" && echo -n " - $Tagline"
|
49
|
49
|
echo
|
50
|
|
- echo '# See LICENSE.md file for copyright and license details.'
|
|
50
|
+ $MkLicense && echo '# See LICENSE.md file for copyright and license details.'
|
51
|
51
|
echo ''
|
52
|
52
|
echo 'MKIT_DIR=utils/mkit'
|
53
|
53
|
#shellcheck disable=SC2016
|
|
@@ -106,7 +106,7 @@ deploy() {
|
106
|
106
|
echo " doc = [ENV:PREFIX]/share/doc/$PackageName"
|
107
|
107
|
echo ""
|
108
|
108
|
echo "[tokens]"
|
109
|
|
- echo " __BIN_DIR__ = [roots:bin]"
|
|
109
|
+ echo " __${PackageName^^}_FOO__ = Barr.."
|
110
|
110
|
echo ""
|
111
|
111
|
echo "[modes]"
|
112
|
112
|
echo " bin = 755"
|
|
@@ -144,7 +144,7 @@ deploy() {
|
144
|
144
|
echo 'make %{?_smp_mflags}'
|
145
|
145
|
echo ''
|
146
|
146
|
echo '%install'
|
147
|
|
- echo '%make_install'
|
|
147
|
+ echo '%make_install PREFIX=/usr'
|
148
|
148
|
echo ''
|
149
|
149
|
echo '%files'
|
150
|
150
|
echo 'MKIT_STUB_FILELIST'
|
|
@@ -197,7 +197,7 @@ deploy() {
|
197
|
197
|
echo ''
|
198
|
198
|
echo 'override_dh_auto_install:'
|
199
|
199
|
echo ''
|
200
|
|
- echo ' make install DESTDIR=debian/tmp'
|
|
200
|
+ echo ' make install PREFIX=/usr DESTDIR=debian/tmp'
|
201
|
201
|
echo ''
|
202
|
202
|
echo 'override_dh_usrlocal:'
|
203
|
203
|
echo ''
|
|
@@ -318,6 +318,17 @@ deploy() {
|
318
|
318
|
echo " * \`MKIT_STUB_FILELIST\` - List of full paths to"
|
319
|
319
|
echo " your files after installation."
|
320
|
320
|
echo ""
|
|
321
|
+ echo " Note that in case of debian/package.install files,"
|
|
322
|
+ echo " PREFIX based paths (eg. /usr/bin) in this file should"
|
|
323
|
+ echo " should be as if PREFIX was /usr/local, despite PREFIX"
|
|
324
|
+ echo " being set to /usr in debian/rules. (Debian's script"
|
|
325
|
+ echo " dh_usrlocal will take care of that.)"
|
|
326
|
+ echo ""
|
|
327
|
+ echo " In case of Fedora-based distro, you should make use"
|
|
328
|
+ echo " of RPM macros:"
|
|
329
|
+ echo ""
|
|
330
|
+ echo " https://fedoraproject.org/wiki/Packaging:RPMMacros"
|
|
331
|
+ echo ""
|
321
|
332
|
echo " Refer to these documents for further details:"
|
322
|
333
|
echo ""
|
323
|
334
|
echo " http://rpm-guide.readthedocs.io/"
|
|
@@ -545,7 +556,6 @@ deploy_packaging() {
|
545
|
556
|
deploy packaging/debian/rules
|
546
|
557
|
deploy packaging/debian/source/format
|
547
|
558
|
deploy packaging/debian/"$PackageName".install
|
548
|
|
- deploy packaging/template.spec
|
549
|
559
|
}
|
550
|
560
|
|
551
|
561
|
init_from_existing() {
|
|
@@ -660,7 +670,7 @@ main() {
|
660
|
670
|
*) usage ;;
|
661
|
671
|
esac
|
662
|
672
|
updating && init_from_existing
|
663
|
|
- if test -n $License; then
|
|
673
|
+ if test -n "$License"; then
|
664
|
674
|
known_licenses | grep -qxF "$License" \
|
665
|
675
|
|| die "unknown license (use -L to get list): $License"
|
666
|
676
|
MkLicense=true
|