Commit efd2d8b8 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix installation of non distributed files.

	* build-aux/generate_dist_headers.sh: install non distributed
	files if installing from a repository copy.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4358 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent d6ce7f42
2009-08-17 Guillaume Lazzara <lazzara@lrde.epita.fr>
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> 2009-08-15 Thierry Geraud <theo@este>
* ChangeLog: Fix. Wrong commit directory, sorry. * ChangeLog: Fix. Wrong commit directory, sorry.
......
...@@ -22,7 +22,7 @@ test -f "$nodist_headers" \ ...@@ -22,7 +22,7 @@ test -f "$nodist_headers" \
echo "Generating $output..." >&2 echo "Generating $output..." >&2
rm -f "$output" rm -f "$output"
cat <<EOF >"$output" cat <<EOF > "$output"
## Generated by \`$me', do not edit by hand. ## Generated by \`$me', do not edit by hand.
nobase_include_HEADERS = \\ nobase_include_HEADERS = \\
...@@ -33,7 +33,27 @@ find $scanned_dir -type f -a \( -name '*.hh' -o -name '*.hxx' \) \ ...@@ -33,7 +33,27 @@ find $scanned_dir -type f -a \( -name '*.hh' -o -name '*.hxx' \) \
| comm -23 - "$nodist_headers" \ | comm -23 - "$nodist_headers" \
| sed -e 's/$/ \\/g' >> $output | sed -e 's/$/ \\/g' >> $output
last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line
sed '$d' < $output > $output.tmp # remove last line sed '$d' < $output > $output.tmp # remove last line
mv $output.tmp $output mv $output.tmp $output
echo $last_line >> $output # put the cleaned last line back. 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment