Next updates for automake..

diff --git a/Makefile.am b/Makefile.am
index 1213b6b39b80ec3e93876685bfa7eb46a4249dd5..729c283dc37587be530801e953be8c807e1c8fcf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,9 @@ SUBDIRS=include alsactl alsamixer amixer aplay utils
 
 rpm: dist
        $(MAKE) -C $@
+
+pack: clean-recursive
+       chown -R root.root ../alsa-utils
+       mv ../alsa-utils ../alsa-utils-$(VERSION)
+       tar --exclude=CVS -cvz -C .. -f ../alsa-utils-$(VERSION).tar.gz alsa-utils-$(VERSION)
+       mv ../alsa-utils-$(VERSION) ../alsa-utils

diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 419630a0f796240175e64f92b47787a5613e98ba..0ebd56ec9cd231d27d6d3ef2127ba609c25942da 100644 (file)
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=alsactl
+sbin_PROGRAMS=alsactl
 noinst_HEADERS=alsactl.h
 man_MANS=alsactl.1
 

diff --git a/utils/alsa-utils.spec.in b/utils/alsa-utils.spec.in
index f7406796dc6be896384f9dd121978c58257b24a0..71633c0c30b001a71075bb8bd4d1b72d9b5c6d4a 100644 (file)
--- a/utils/alsa-utils.spec.in
+++ b/utils/alsa-utils.spec.in
@@ -1,4 +1,4 @@
-%define ver      @SND_UTIL_VERSION@
+%define ver      @VERSION@
 %define rel      1
 %define prefix   /
 

diff --git a/utils/buildrpm b/utils/buildrpm
index 1898f1cb67e400de3e6648b462366a2e3d7c76a2..408cdd3202044653da4d3d28dfb54d195186a6fc 100644 (file)
--- a/utils/buildrpm
+++ b/utils/buildrpm
@@ -4,7 +4,7 @@ source=.
 version=`cat $source/../version`
 package=$source/../../alsa-utils-$version.tar.gz
 
-make -C .. dist
+make -C .. pack
 
 if [ ! -r $package ]; then
   echo "Error: wrong package: $package"