Commit 0d106722 authored by johnf's avatar johnf
Browse files

* update autogen for automake 1.0

* Add autogen to debian/rules so svn-buildpackage works


git-svn-id: http://svn.annodex.net/libfishsound/branches/1.0-stable@3378 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 1fdf153d
......@@ -41,7 +41,9 @@ fi
#
automake_version="none"
if automake-1.9 --version >/dev/null 2>&1; then
if automake-1.10 --version >/dev/null 2>&1; then
automake_version="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
automake_version="-1.9"
elif automake-1.8 --version >/dev/null 2>&1; then
automake_version="-1.8"
......@@ -60,6 +62,7 @@ elif automake --version > /dev/null 2>&1; then
1.7*) automake_version="-1.7" ;;
1.8*) automake_version="-1.8" ;;
1.9*) automake_version="-1.9" ;;
1.10*) automake_version="-1.10" ;;
esac
fi
......@@ -161,7 +164,8 @@ distribution directories, e.g.:
export CPPFLAGS="-I/sw/include \$CPPFLAGS"
export LDFLAGS="-L/sw/lib \$LDFLAGS"
export PKG_CONFIG_PATH="/sw/lib/pkgconfig:\$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/sw/lib/pkgconfig:\$PKG_CONFIG_PATH"
./configure
EOF
......
......@@ -16,8 +16,10 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
configure: configure-stamp
configure-stamp:
configure:
./autogen.sh
config.status: configure
dh_testdir
CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
......@@ -29,7 +31,7 @@ configure-stamp:
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
-$(MAKE) check
......
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