[Olena-patches] 4358: Fix installation of non distributed files.

* build-aux/generate_dist_headers.sh: install non distributed files if installing from a repository copy. --- ChangeLog | 7 +++++++ build-aux/generate_dist_headers.sh | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c272ea5..49781e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-08-17 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Fix installation of non distributed files. + + * build-aux/generate_dist_headers.sh: install non distributed + files if installing from a repository copy. + 2009-08-15 Thierry Geraud <theo@este> * ChangeLog: Fix. Wrong commit directory, sorry. diff --git a/build-aux/generate_dist_headers.sh b/build-aux/generate_dist_headers.sh index 60aa946..02898b5 100755 --- a/build-aux/generate_dist_headers.sh +++ b/build-aux/generate_dist_headers.sh @@ -22,7 +22,7 @@ test -f "$nodist_headers" \ echo "Generating $output..." >&2 rm -f "$output" -cat <<EOF >"$output" +cat <<EOF > "$output" ## Generated by \`$me', do not edit by hand. nobase_include_HEADERS = \\ @@ -33,7 +33,27 @@ find $scanned_dir -type f -a \( -name '*.hh' -o -name '*.hxx' \) \ | comm -23 - "$nodist_headers" \ | sed -e 's/$/ \\/g' >> $output + last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line sed '$d' < $output > $output.tmp # remove last line mv $output.tmp $output echo $last_line >> $output # put the cleaned last line back. + + +# Add non distributed files to installed headers list. +# +# Non distributed headers will be installed if the installation +# process is launched from the repository copy. +cat <<EOF >> "$output" +#<<lrde +nobase_include_HEADERS += \\ +EOF + +cat $nodist_headers | sed -e 's/$/ \\/g' >> $output + +last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line +sed '$d' < $output > $output.tmp # remove last line +mv $output.tmp $output +echo $last_line >> $output # put the cleaned last line back. + +echo "#>>" >> $output \ No newline at end of file -- 1.5.6.5