* bootstrap: Add new arguments to generate_dist_headers.sh
* build-aux/generate_dist_headers.sh: Allow to specify a specific
include directory.
---
ChangeLog | 9 +++++++++
bootstrap | 2 +-
build-aux/generate_dist_headers.sh | 27 +++++++++++++++++++++++----
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49781e0..6a03c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-19 Guillaume Lazzara <lazzara(a)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(a)lrde.epita.fr>
Fix installation of non distributed files.
diff --git a/bootstrap b/bootstrap
index 53bf1c2..17324b4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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.
diff --git a/build-aux/generate_dist_headers.sh b/build-aux/generate_dist_headers.sh
index 02898b5..2cace34 100755
--- a/build-aux/generate_dist_headers.sh
+++ b/build-aux/generate_dist_headers.sh
@@ -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
--
1.5.6.5
Show replies by date