[xiph-commits] r3378 - in libfishsound/branches/1.0-stable: . debian

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-01-23 21:01:27 -0800 (Wed, 23 Jan 2008)
New Revision: 3378

Modified:
   libfishsound/branches/1.0-stable/autogen.sh
   libfishsound/branches/1.0-stable/debian/rules
Log:
* update autogen for automake 1.0
* Add autogen to debian/rules so svn-buildpackage works


Modified: libfishsound/branches/1.0-stable/autogen.sh
===================================================================
--- libfishsound/branches/1.0-stable/autogen.sh	2008-01-24 04:55:20 UTC (rev 3377)
+++ libfishsound/branches/1.0-stable/autogen.sh	2008-01-24 05:01:27 UTC (rev 3378)
@@ -41,7 +41,9 @@
 #
 
 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 @@
     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 @@
 
  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

Modified: libfishsound/branches/1.0-stable/debian/rules
===================================================================
--- libfishsound/branches/1.0-stable/debian/rules	2008-01-24 04:55:20 UTC (rev 3377)
+++ libfishsound/branches/1.0-stable/debian/rules	2008-01-24 05:01:27 UTC (rev 3378)
@@ -16,8 +16,10 @@
 	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 @@
 	touch configure-stamp
 
 build: build-stamp
-build-stamp: configure-stamp
+build-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	-$(MAKE) check