From 1f84a14b0bae513fc2fdad4fe6fca32e05af67bc Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 23 May 2003 01:59:43 +0000
Subject: Bug 83: fixes for building when $srcdir != $builddir from David Lee
 <t.d.lee@durham.ac.uk> (This used to be commit
 e48a8b5e9c1a75c6e4bffe022d0e25edae89bc58)

---
 source3/script/mkproto.sh    | 43 ----------------------------------------
 source3/script/mkproto.sh.in | 47 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 43 deletions(-)
 delete mode 100755 source3/script/mkproto.sh
 create mode 100755 source3/script/mkproto.sh.in

(limited to 'source3/script')

diff --git a/source3/script/mkproto.sh b/source3/script/mkproto.sh
deleted file mode 100755
index 2bf96c9b41..0000000000
--- a/source3/script/mkproto.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-LANG=C; export LANG
-LC_ALL=C; export LC_ALL
-LC_COLLATE=C; export LC_COLLATE
-
-if [ $# -lt 3 ]
-then
-  echo "Usage: $0 awk [-h headerdefine] outputheader proto_obj"
-  exit 1
-fi
-
-awk="$1"
-shift
-
-if [ x"$1" = x-h ]
-then
-  headeropt="-v headername=$2"
-  shift; shift;
-else
-  headeropt=""
-fi
-
-header="$1"
-shift
-headertmp="$header.$$.tmp~"
-
-proto_src="`echo $@ | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'ubiqx/|wrapped'`"
-
-echo creating $header
-
-mkdir -p `dirname $header`
-
-${awk} $headeropt \
-  -f script/mkproto.awk $proto_src > $headertmp
-
-if cmp -s $header $headertmp 2>/dev/null
-then
-  echo "$header unchanged"
-  rm $headertmp
-else
-  mv $headertmp $header
-fi
diff --git a/source3/script/mkproto.sh.in b/source3/script/mkproto.sh.in
new file mode 100755
index 0000000000..8d7d300ff5
--- /dev/null
+++ b/source3/script/mkproto.sh.in
@@ -0,0 +1,47 @@
+#! /bin/sh -x
+
+LANG=C; export LANG
+LC_ALL=C; export LC_ALL
+LC_COLLATE=C; export LC_COLLATE
+
+# Need reference point for "mkproto.awk", including when "srcdir != builddir".
+# Use of "abs_..." is unpleasant.  Is there another way?
+abs_srcdir=@abs_srcdir@
+
+if [ $# -lt 3 ]
+then
+  echo "Usage: $0 awk [-h headerdefine] outputheader proto_obj"
+  exit 1
+fi
+
+awk="$1"
+shift
+
+if [ x"$1" = x-h ]
+then
+  headeropt="-v headername=$2"
+  shift; shift;
+else
+  headeropt=""
+fi
+
+header="$1"
+shift
+headertmp="$header.$$.tmp~"
+
+proto_src="`echo $@ | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'ubiqx/|wrapped'`"
+
+echo creating $header
+
+mkdir -p `dirname $header`
+
+${awk} $headeropt \
+  -f $abs_srcdir/mkproto.awk $proto_src > $headertmp
+
+if cmp -s $header $headertmp 2>/dev/null
+then
+  echo "$header unchanged"
+  rm $headertmp
+else
+  mv $headertmp $header
+fi
-- 
cgit