kopia lustrzana https://gitlab.com/sane-project/backends
Collect patches in one place and distribute them
rodzic
129b53bbca
commit
7acfdead70
|
@ -47,6 +47,13 @@ dist_changelogs_DATA += ChangeLogs/ChangeLog-1.0.0
|
||||||
|
|
||||||
EXTRA_DIST = .editorconfig
|
EXTRA_DIST = .editorconfig
|
||||||
EXTRA_DIST += po/README
|
EXTRA_DIST += po/README
|
||||||
|
# Just in case these come in handy during development started from a
|
||||||
|
# regular source tarball. They are not needed otherwise as they are
|
||||||
|
# already applied to the files in the source tarball.
|
||||||
|
EXTRA_DIST += patches/ltmain.sh.patch
|
||||||
|
EXTRA_DIST += patches/Rules-quot.patch
|
||||||
|
EXTRA_DIST += patches/ax_create_stdint_h.19-20.m4.patch
|
||||||
|
EXTRA_DIST += patches/ax_create_stdint_h.20-21.m4.patch
|
||||||
|
|
||||||
#
|
#
|
||||||
# Keep the .gitignore files sorted, and use this target to do it.
|
# Keep the .gitignore files sorted, and use this target to do it.
|
||||||
|
|
10
autogen.sh
10
autogen.sh
|
@ -2,6 +2,8 @@
|
||||||
test -n "$srcdir" || srcdir=`dirname "$0"`
|
test -n "$srcdir" || srcdir=`dirname "$0"`
|
||||||
test -n "$srcdir" || srcdir=.
|
test -n "$srcdir" || srcdir=.
|
||||||
|
|
||||||
|
patchdir="$srcdir/patches"
|
||||||
|
|
||||||
# Suppress warnings about obsolete macros if still needed (#122)
|
# Suppress warnings about obsolete macros if still needed (#122)
|
||||||
ac_dir=$(aclocal --print-ac-dir)
|
ac_dir=$(aclocal --print-ac-dir)
|
||||||
if test -r "$ac_dir/ax_create_stdint_h.m4"; then
|
if test -r "$ac_dir/ax_create_stdint_h.m4"; then
|
||||||
|
@ -14,17 +16,17 @@ if test -r "$ac_dir/ax_create_stdint_h.m4"; then
|
||||||
if test "$serial" -lt 20; then
|
if test "$serial" -lt 20; then
|
||||||
echo "patching file $target to #serial 20"
|
echo "patching file $target to #serial 20"
|
||||||
patch --quiet $target \
|
patch --quiet $target \
|
||||||
"$srcdir/ax_create_stdint_h.19-20.m4.patch"
|
"$patchdir/ax_create_stdint_h.19-20.m4.patch"
|
||||||
fi
|
fi
|
||||||
echo "patching file $target to #serial 21"
|
echo "patching file $target to #serial 21"
|
||||||
patch --quiet "$target" \
|
patch --quiet "$target" \
|
||||||
"$srcdir/ax_create_stdint_h.20-21.m4.patch"
|
"$patchdir/ax_create_stdint_h.20-21.m4.patch"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
autoreconf --force --install --verbose --warnings=all "$srcdir"
|
autoreconf --force --install --verbose --warnings=all "$srcdir"
|
||||||
patch "$srcdir/ltmain.sh" "$srcdir/ltmain.sh.patch"
|
patch "$srcdir/ltmain.sh" "$patchdir/ltmain.sh.patch"
|
||||||
patch "$srcdir/po/Rules-quot" "$srcdir/Rules-quot.patch"
|
patch "$srcdir/po/Rules-quot" "$patchdir/Rules-quot.patch"
|
||||||
autoreconf "$srcdir"
|
autoreconf "$srcdir"
|
||||||
|
|
||||||
# Taken from https://gitlab.com/utsushi/utsushi/blob/master/bootstrap
|
# Taken from https://gitlab.com/utsushi/utsushi/blob/master/bootstrap
|
||||||
|
|
Ładowanie…
Reference in New Issue