Some patches for clean compilation...

diff --git a/Makefile.am b/Makefile.am
index 9ec8c8fa906ae6d80c872b35e5f209174ed32de2..93d132d41e0da517a284a15bb9b318bf86735011 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,10 @@ EXTRA_DIST=ChangeLog INSTALL configure cvscompile
 INCLUDES=-I$(top_srcdir)/include
 
 rpm: dist
-       $(MAKE) -C utils rpm
\ No newline at end of file
+       $(MAKE) -C utils rpm
+
+pack: clean-recursive
+       chown -R root.root ../alsa-lib
+       mv ../alsa-lib ../alsa-lib-$(SND_LIB_VERSION)
+       tar --exclude=CVS -cvz -C .. -f ../alsa-lib-$(SND_LIB_VERSION).tar.gz alsa-lib-$(SND_LIB_VERSION)
+       mv ../alsa-lib-$(SND_LIB_VERSION) ../alsa-lib 

diff --git a/utils/buildrpm b/utils/buildrpm
index aaf88659d9460f1b8f7f60514eb796f95ae346d1..1bc1fadb222c6ea3a5ef09692009b6c4a2cd6f64 100644 (file)
--- a/utils/buildrpm
+++ b/utils/buildrpm
@@ -1,16 +1,19 @@
 #!/bin/bash
 
 source=.
-version=$VERSION
-package=$source/../alsa-lib-$version.tar.gz
+version=`cat $source/../version`
+package=$source/../../alsa-lib-$version.tar.gz
+
+make -C .. pack
 
 if [ ! -r $package ]; then
-  echo "Error: wrong package: $package"
-  exit 1
+  package=$source/../alsa-lib-$version.tar.gz
+  if [ ! -r $package ]; then
+    echo "Error: wrong package: $package"
+    exit 1
+  fi
 fi
 
-make -C .. dist
-
 cp -fv $package /usr/src/redhat/SOURCES
 
 if [ ! -r $source/buildrpm ]; then