Commit 98ba8372 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Install scribo headers in a specific scribo include dir.

	* bootstrap: Add new arguments to generate_dist_headers.sh

	* build-aux/generate_dist_headers.sh: Allow to specify a specific
	include directory.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4370 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent ca13cacb
2009-08-19 Guillaume Lazzara <lazzara@lrde.epita.fr>
Install scribo headers in a specific scribo include dir.
* bootstrap: Add new arguments to generate_dist_headers.sh
* build-aux/generate_dist_headers.sh: Allow to specify a specific
include directory.
2009-08-17 Guillaume Lazzara <lazzara@lrde.epita.fr>
Fix installation of non distributed files.
......
......@@ -132,7 +132,7 @@ set -x
run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers
# Generate scribo/headers.mk
run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers
run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers scribo scribo
# Generate lists of files to be part of the distribution
# for the tutorial.
......
......@@ -8,8 +8,8 @@
# Use the C locale to have a deterministic sort.
export LC_ALL=C
if [ $# -ne 3 ]; then
echo "$0 <scanned_dir> <output> <nodist-headers>"
if [ $# -ne 3 ] && [ $# -ne 5 ]; then
echo "$0 <scanned_dir> <output> <nodist-headers> [<module name> <inc_path>]"
exit 1
fi
......@@ -22,11 +22,21 @@ test -f "$nodist_headers" \
echo "Generating $output..." >&2
rm -f "$output"
cat <<EOF > "$output"
if [ $# -eq 5 ]; then
cat <<EOF > "$output"
## Generated by \`$me', do not edit by hand.
$4dir = \$(includedir)/$5
nobase_$4_HEADERS = \\
EOF
else
cat <<EOF > "$output"
## Generated by \`$me', do not edit by hand.
nobase_include_HEADERS = \\
EOF
fi
find $scanned_dir -type f -a \( -name '*.hh' -o -name '*.hxx' \) \
| sort \
......@@ -44,10 +54,19 @@ echo $last_line >> $output # put the cleaned last line back.
#
# Non distributed headers will be installed if the installation
# process is launched from the repository copy.
cat <<EOF >> "$output"
if [ $# -eq 5 ]; then
cat <<EOF >> "$output"
#<<lrde
nobase_$4_HEADERS += \\
EOF
else
cat <<EOF >> "$output"
#<<lrde
nobase_include_HEADERS += \\
EOF
fi
cat $nodist_headers | sed -e 's/$/ \\/g' >> $output
......
Markdown is supported
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