diff --git a/debian/changelog b/debian/changelog index 94ccc97fe153d42a35b2005a74b394fde90d051f..40d9d74874b2dbad41f5ee2eae57a226f4e34bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ postgresql-common (193) UNRELEASED; urgency=medium * Use /run in /usr/lib/tmpfiles.d/postgresql.conf to avoid deprecation warning. (Closes: #902875) + [ Christoph Berg ] + * pg_buildext: Stop passing srcdir to make invocations. + -- Christoph Berg <myon@debian.org> Wed, 15 Aug 2018 17:59:38 +0200 postgresql-common (192) unstable; urgency=medium diff --git a/pg_buildext b/pg_buildext index 791912ff68b9f2350b70e6ffbeede1f78bb6012c..296c35f87251b4c5ecb480fadc584cf8b16914ee 100755 --- a/pg_buildext +++ b/pg_buildext @@ -4,7 +4,7 @@ # versions # # (C) 2010 Dimitri Fontaine <dfontaine@hi-media.com> -# (C) 2011-2017 Christoph Berg <myon@debian.org> +# (C) 2011-2018 Christoph Berg <myon@debian.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -70,7 +70,7 @@ build() { mkdir -p $vtarget # if a Makefile was created by configure, use it, else the top level Makefile [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile" - make -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1 + make -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 } install() { @@ -80,7 +80,7 @@ install() { mkdir -p $vtarget # if a Makefile was created by configure, use it, else the top level Makefile [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile" - make -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1 + make -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 } clean() { @@ -88,7 +88,7 @@ clean() { # if a Makefile was created by configure, use it, else the top level Makefile [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile" - [ -d $vtarget ] && make -C $vtarget clean ${makefile:-} PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1 + [ -d $vtarget ] && make -C $vtarget clean ${makefile:-} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 rm -rf $vtarget } @@ -119,7 +119,7 @@ installcheck() { [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile" if ! pg_virtualenv $VENVARGS -v $1 \ make -C $vtarget ${makefile:-} installcheck \ - PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1; then + PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1; then if [ -r $vtarget/regression.diffs ]; then echo "**** $vtarget/regression.diffs ****" cat $vtarget/regression.diffs @@ -128,7 +128,7 @@ installcheck() { fi else if ! pg_virtualenv $VENVARGS -v $1 \ - make installcheck PG_CONFIG="$pgc" srcdir="$srcdir" USE_PGXS=1; then + make installcheck PG_CONFIG="$pgc" USE_PGXS=1; then if [ -r regression.diffs ]; then echo "**** regression.diffs ****" cat regression.diffs