Ensure astyle.sh appears in build tree too, and fix it

visr · May 22, 2019 · 01243b0 · 01243b0
1 parent 919112e
commit 01243b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -46,6 +46,8 @@ AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([include/config.h])
 AC_PROG_CC
 
+AC_CONFIG_LINKS([tools/astyle.sh:tools/astyle.sh])
+
 dnl -- JTS_PORT: the version of JTS this release is bound to
 dnl JTS_PORT=1.13.0
 JTS_PORT=`cat $VERTXT | awk -F= '/^JTS_PORT/ {print $2}'`

diff --git a/tools/astyle.sh b/tools/astyle.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-cd `dirname $0`
-astyle/astyle \
+DIR=`dirname $0`
+${DIR}/astyle/astyle \
   --style=stroustrup \
   --unpad-paren \
   --pad-header \
@@ -10,4 +10,4 @@ astyle/astyle \
   --align-pointer=type \
   --max-code-length=120 \
   --lineend=linux \
-  @$
+  $@