diff options
| -rw-r--r-- | macros/gnome-pilot.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index f35e9b0399..c7c82bfd73 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -44,7 +44,6 @@ AC_DEFUN([PILOT_LINK_HOOK],[ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock" piversion_include="$prefix/include/pi-version.h" if test x$PISOCK_LIBDIR = x; then - echo Assuming libpisock in $prefix/lib incdir="$prefix/include" PISOCK_LIBS="-L$prefix/lib -lpisock" fi ], @@ -66,12 +65,13 @@ AC_DEFUN([PILOT_LINK_HOOK],[ if test x$piversion_include = x; then piversion_include="pi-version.h" - pi_version=`cat $incdir/pi-version.h|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'` - pi_major=`cat $incdir/pi-version.h|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'` - pi_minor=`cat $incdir/pi-version.h|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'` - pi_patch=`cat $incdir/pi-version.h|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'` fi + pi_version=`cat $piversion_include|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'` + pi_major=`cat $piversion_include|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'` + pi_minor=`cat $piversion_include|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'` + pi_patch=`cat $piversion_include|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'` + PILOT_LINK_VERSION="$pi_version.$pi_major.$pi_minor$pi_patch" if test x$testplversion = xyes; then |