summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2006-08-01 15:30:48 +0000
committerLuotao Fu <l.fu@pengutronix.de>2006-08-01 15:30:48 +0000
commit6eecd66e1f3aca149b0b01870a2e4201939579a5 (patch)
treece4aeb34b44b890abf4e6ab820117d9e51044313 /rules
parentb40417c1b477237f257847879791a140e088f124 (diff)
downloadptxdist-6eecd66e1f3aca149b0b01870a2e4201939579a5.tar.gz
ptxdist-6eecd66e1f3aca149b0b01870a2e4201939579a5.tar.xz
fixed alsa utils and alsa library
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@5967 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/alsa-lib.make20
-rw-r--r--rules/alsa-utils.make24
2 files changed, 33 insertions, 11 deletions
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 7540e8f48..b3a5ada49 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -137,6 +137,26 @@ $(STATEDIR)/alsa-lib.targetinstall: $(alsa-lib_targetinstall_deps_default)
@$(call install_copy, alsa-lib, \
0, 0, 0755, $(ALSA_LIB_DIR)/modules/mixer/simple/.libs/smixer-hda.so, \
/lib/alsa-lib/smixer/smixer-hda.so )
+
+ @$(call install_copy, alsa-lib, \
+ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/alsa.conf, \
+ /usr/share/alsa/alsa.conf, n)
+
+ @$(call install_copy, alsa-lib, \
+ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/pcm/default.conf, \
+ /usr/share/alsa/pcm/default.conf, n)
+
+ @$(call install_copy, alsa-lib, \
+ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/cards/aliases.conf, \
+ /usr/share/alsa/cards/aliases.conf, n)
+
+ @$(call install_copy, alsa-lib, \
+ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/pcm/dmix.conf, \
+ /usr/share/alsa/pcm/dmix.conf, n)
+
+ @$(call install_copy, alsa-lib, \
+ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/pcm/dsnoop.conf, \
+ /usr/share/alsa/pcm/dsnoop.conf, n)
@$(call install_finish, alsa)
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index da5e21c76..dc90b578a 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -113,18 +113,20 @@ $(STATEDIR)/alsa-utils.targetinstall: $(alsa-utils_targetinstall_deps_default)
@$(call install_fixup, alsa-utils, DEPENDS,)
@$(call install_fixup, alsa-utils, DESCRIPTION, missing)
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/alsactl/alsactl, /sbin/alsactl );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/alsamixer/alsamixer, /sbin/alsamixer );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amidi/amidi, /sbin/amidi );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amixer/amixer, /sbin/amixer );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/aplay/aplay, /sbin/aplay);
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/alsactl/alsactl, /usr/sbin/alsactl)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/alsamixer/alsamixer, /usr/bin/alsamixer)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amidi/amidi, /usr/bin/amidi)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/amixer/amixer, /usr/bin/amixer)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/aplay/aplay, /usr/bin/aplay)
# link arecord aplay
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/iecset/iecset, /sbin/iecset );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aconnect/aconnect, /sbin/aconnect );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aplaymidi/aplaymidi, /sbin/aplaymidi);
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aplaymidi/arecordmidi, /sbin/arecordmidi);
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aseqdump/aseqdump, /sbin/aseqdump );
- @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aseqnet/aseqnet, /sbin/aseqnet );
+ @$(call install_link, alsa-utils, aplay, /usr/bin/arecord)
+
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/iecset/iecset, /usr/bin/iecset)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aconnect/aconnect, /usr/bin/aconnect)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aplaymidi/aplaymidi, /usr/bin/aplaymidi)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aplaymidi/arecordmidi, /usr/bin/arecordmidi)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aseqdump/aseqdump, /usr/bin/aseqdump)
+ @$(call install_copy, alsa-utils, 0, 0, 0755, $(ALSA_UTILS_DIR)/seq/aseqnet/aseqnet, /usr/bin/aseqnet)
@$(call install_finish, alsa)