Makefile.am: Fixed bug #63409: make install fails in out-of-source build.

This commit is contained in:
Ole Tange 2022-11-24 22:22:37 +01:00
parent fc277924dd
commit c444cfc333
7 changed files with 61 additions and 31 deletions

View file

@ -176,7 +176,7 @@ bashcompletion=${bashcompletiondir}/parallel
zshcompletion=${zshcompletiondir}/_parallel zshcompletion=${zshcompletiondir}/_parallel
install-data-hook: install-data-hook:
mkdir -p ${zshcompletiondir} ${bashcompletiondir} mkdir -p ${zshcompletiondir} ${bashcompletiondir}
src/parallel --shell-completion bash > ${bashcompletion} $(bindir)/parallel --shell-completion bash > ${bashcompletion}
# Make zsh eval the --shell-completion code dynamically so if # Make zsh eval the --shell-completion code dynamically so if
# a newer version of GNU Parallel is installed by a normal # a newer version of GNU Parallel is installed by a normal
# user, this newer version will generate the # user, this newer version will generate the
@ -186,4 +186,7 @@ install-data-hook:
echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion} echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
echo ' _comp_parallel' >> ${zshcompletion} echo ' _comp_parallel' >> ${zshcompletion}
uninstall-hook:
rm -rf ${zshcompletiondir} ${bashcompletiondir}
EXTRA_DIST = CITATION CITATION.cff CREDITS LICENSES/CC-BY-SA-4.0.txt LICENSES/GFDL-1.3-or-later.txt LICENSES/GPL-3.0-or-later.txt EXTRA_DIST = CITATION CITATION.cff CREDITS LICENSES/CC-BY-SA-4.0.txt LICENSES/GFDL-1.3-or-later.txt LICENSES/GPL-3.0-or-later.txt

View file

@ -749,9 +749,10 @@ ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(am__recursive_targets) all install-am install-data-am \ .MAKE: $(am__recursive_targets) all install-am install-data-am \
install-strip install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \ am--refresh check check-am clean clean-cscope clean-generic \
@ -767,7 +768,7 @@ uninstall-am:
install-strip installcheck installcheck-am installdirs \ install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \ installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am tags-am uninstall uninstall-am uninstall-hook
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -936,7 +937,7 @@ pack_unpack_and_test_build:
./configure && make -j && sudo make -j install ./configure && make -j && sudo make -j install
install-data-hook: install-data-hook:
mkdir -p ${zshcompletiondir} ${bashcompletiondir} mkdir -p ${zshcompletiondir} ${bashcompletiondir}
src/parallel --shell-completion bash > ${bashcompletion} $(bindir)/parallel --shell-completion bash > ${bashcompletion}
# Make zsh eval the --shell-completion code dynamically so if # Make zsh eval the --shell-completion code dynamically so if
# a newer version of GNU Parallel is installed by a normal # a newer version of GNU Parallel is installed by a normal
# user, this newer version will generate the # user, this newer version will generate the
@ -946,6 +947,9 @@ install-data-hook:
echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion} echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
echo ' _comp_parallel' >> ${zshcompletion} echo ' _comp_parallel' >> ${zshcompletion}
uninstall-hook:
rm -rf ${zshcompletiondir} ${bashcompletiondir}
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

4
NEWS
View file

@ -1,12 +1,14 @@
20221122 20221122
New in this release:
* Support for IPv6 adresses and _ in hostnames in --sshlogin. * Support for IPv6 adresses and _ in hostnames in --sshlogin.
* Use --total-jobs for --eta/--bar if generating jobs is slow. * Use --total-jobs for --eta/--bar if generating jobs is slow.
* A lot of bug fixed in --latest-line. * A lot of bug fixed in --latest-line.
* Better support MSYS2. * Better support for MSYS2.
* Better Text::CSV error messages. * Better Text::CSV error messages.

View file

@ -152,9 +152,9 @@ cp ../parallel-web/parallel/parallel.html ../parallel-web/parallel/man.html
pushd ../parallel-web/parallel pushd ../parallel-web/parallel
# Bug at Savannah makes this take 30 seconds # Bug at Savannah makes this take 30 seconds
(cd ..; (cd ..;
torsocks cvs -z3 -d:ext:tange@cvs.savannah.gnu.org:/web/parallel co parallel) cvs -z3 -d:ext:tange@cvs.savannah.gnu.org:/web/parallel co parallel)
torsocks cvs up cvs up
torsocks cvs ci -m "New release" cvs ci -m "New release"
pushd pushd
== Commit released version == == Commit released version ==

View file

@ -543,7 +543,7 @@ string that is not in the command line.
See also: B<:::> See also: B<:::>
=item B<--bar> (alpha testing) =item B<--bar> (beta testing)
Show progress as a progress bar. Show progress as a progress bar.
@ -751,7 +751,7 @@ See also: B<--basefile> B<--transfer> B<--transferfile> B<--sshlogin>
B<--return> B<--return>
=item B<--color> (beta testing) =item B<--color>
Colour output. Colour output.
@ -763,9 +763,9 @@ B<--color> is ignored when using B<-u>.
See also: B<--color-failed> See also: B<--color-failed>
=item B<--color-failed> (beta testing) =item B<--color-failed>
=item B<--cf> (beta testing) =item B<--cf>
Colour the output from failing jobs white on red. Colour the output from failing jobs white on red.
@ -833,7 +833,7 @@ to stdout (standard output) unless B<--decompress-program> is given.
See also: B<--compress> See also: B<--compress>
=item B<--csv> (alpha testing) =item B<--csv> (beta testing)
Treat input as CSV-format. Treat input as CSV-format.
@ -1049,7 +1049,7 @@ Outputs: 1,1 1,2 1,3 2,2 2,3 3,3
See also: B<skip()> B<--no-run-if-empty> See also: B<skip()> B<--no-run-if-empty>
=item B<--filter-hosts> (alpha testing) =item B<--filter-hosts> (beta testing)
Remove down hosts. Remove down hosts.
@ -1581,9 +1581,9 @@ Similar to B<--memfree>.
See also: B<--memfree> B<--load> See also: B<--memfree> B<--load>
=item B<--latest-line> (alpha testing) =item B<--latest-line> (beta testing)
=item B<--ll> (alpha testing) =item B<--ll> (beta testing)
Print the lastest line. Each job gets a single line that is updated Print the lastest line. Each job gets a single line that is updated
with the lastest output from the job. with the lastest output from the job.
@ -1600,9 +1600,9 @@ Example:
See also: B<--line-buffer> See also: B<--line-buffer>
=item B<--line-buffer> (beta testing) =item B<--line-buffer>
=item B<--lb> (beta testing) =item B<--lb>
Buffer output on line basis. Buffer output on line basis.
@ -2019,7 +2019,7 @@ B<--progress> on a running GNU B<parallel> process.
See also: B<--eta> B<--bar> See also: B<--eta> B<--bar>
=item B<--max-line-length-allowed> (alpha testing) =item B<--max-line-length-allowed> (beta testing)
Print maximal command line length. Print maximal command line length.
@ -3026,13 +3026,13 @@ I<duration> is in seconds, but can be postfixed with s, m, h, or d.
See also: TIME POSTFIXES B<--sshlogin> B<--delay> See also: TIME POSTFIXES B<--sshlogin> B<--delay>
=item B<--sshlogin> I<[@hostgroups/][ncpus/]sshlogin[,[@hostgroups/][ncpus/]sshlogin[,...]]> (alpha testing) =item B<--sshlogin> I<[@hostgroups/][ncpus/]sshlogin[,[@hostgroups/][ncpus/]sshlogin[,...]]> (beta testing)
=item B<--sshlogin> I<@hostgroup> (alpha testing) =item B<--sshlogin> I<@hostgroup> (beta testing)
=item B<-S> I<[@hostgroups/][ncpus/]sshlogin[,[@hostgroups/][ncpus/]sshlogin[,...]]> (alpha testing) =item B<-S> I<[@hostgroups/][ncpus/]sshlogin[,[@hostgroups/][ncpus/]sshlogin[,...]]> (beta testing)
=item B<-S> I<@hostgroup> (alpha testing) =item B<-S> I<@hostgroup> (beta testing)
Distribute jobs to remote computers. Distribute jobs to remote computers.
@ -3225,7 +3225,7 @@ then killed. Process groups are dependant on the tty.
See also: B<--ungroup> B<--open-tty> See also: B<--ungroup> B<--open-tty>
=item B<--tag> (alpha testing) =item B<--tag> (beta testing)
Tag lines with arguments. Tag lines with arguments.
@ -3238,7 +3238,7 @@ B<--tag> is ignored when using B<-u>.
See also: B<--tagstring> B<--ctag> See also: B<--tagstring> B<--ctag>
=item B<--tagstring> I<str> (alpha testing) =item B<--tagstring> I<str> (beta testing)
Tag lines with a string. Tag lines with a string.
@ -3290,9 +3290,9 @@ dies before the waiting time is up.
See also: B<--halt> B<--timeout> B<--memfree> See also: B<--halt> B<--timeout> B<--memfree>
=item B<--total-jobs> I<jobs> (alpha testing) =item B<--total-jobs> I<jobs> (beta testing)
=item B<--total> I<jobs> (alpha testing) =item B<--total> I<jobs> (beta testing)
Provide the total number of jobs for computing ETA which is also used Provide the total number of jobs for computing ETA which is also used
for B<--bar>. for B<--bar>.

View file

@ -76,7 +76,7 @@ If no commands are given SQL is read from the keyboard or STDIN.
Example: echo 'SELECT * FROM foo;' | sql mysql:/// Example: echo 'SELECT * FROM foo;' | sql mysql:///
=item B<--csv> (beta testing) =item B<--csv>
CSV output. CSV output.
@ -102,9 +102,9 @@ Print a summary of the options to GNU B<sql> and exit.
HTML output. Turn on HTML tabular output. HTML output. Turn on HTML tabular output.
=item B<--json> (beta testing) =item B<--json>
=item B<--pretty> (beta testing) =item B<--pretty>
Pretty JSON output. Pretty JSON output.

View file

@ -1,5 +1,26 @@
#!/bin/bash #!/bin/bash
# Copyright (C) 2022-2022 Ole Tange, http://ole.tange.dk and Free
# Software Foundation, Inc.
#
# 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
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>
# or write to the Free Software Foundation, Inc., 51 Franklin St,
# Fifth Floor, Boston, MA 02110-1301 USA
#
# SPDX-FileCopyrightText: 2022-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc.
# SPDX-License-Identifier: GPL-3.0-or-later
grep -hv '(dead)' ../src/* | grep -hv '(dead)' ../src/* |
# Merge lines ending in . # Merge lines ending in .
perl -pe 's{(http\S+\.)\s}{$1}s' | perl -pe 's{(http\S+\.)\s}{$1}s' |