summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2001-09-11 09:34:13 +0000
committerJaroslav Kysela <perex@perex.cz>2001-09-11 09:34:13 +0000
commit0a8749a8026976e85ff486aa7872a05c2f0e150b (patch)
tree06e04f02987ebaee008a2483ce610cb1df74b6c4 /include
parent3c9d27c82dd1f51a900a45b4194306b008843295 (diff)
downloadalsa-lib-0a8749a8026976e85ff486aa7872a05c2f0e150b.tar.gz
Changed location of asoundlib.h from sys dir to alsa dir.
(it means that official location is '#include <alsa/asoundlib.h>')
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am8
-rw-r--r--include/header.h4
-rw-r--r--include/local.h1
3 files changed, 10 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 31bfe752..58bb7b25 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
-sysincludedir = ${includedir}/sys
-sysinclude_HEADERS = asoundlib.h
+alsaincludedir = ${includedir}/alsa
+alsainclude_HEADERS = asoundlib.h
# This is the order they will be concatenated into asoundlib.h!
#
@@ -39,3 +39,7 @@ stamp-vh: $(top_builddir)/configure.in
-@rm -f ver.tmp
INCLUDES=-I$(top_srcdir)/include
+
+install-exec-hook:
+ rm -f $(alsaincludedir)/asoundef.h
+ (cd $(DESTDIR)$(alsaincludedir) && $(LN_S) ../sound/asoundef.h asoundef.h)
diff --git a/include/header.h b/include/header.h
index fb7150c5..88accc66 100644
--- a/include/header.h
+++ b/include/header.h
@@ -28,7 +28,9 @@
#ifndef __ASOUNDLIB_H
#define __ASOUNDLIB_H
-#include <sound/asoundef.h>
+#ifndef __ASOUNDEF_H
+#include <alsa/asoundef.h>
+#endif
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/include/local.h b/include/local.h
index 7712b89a..2bd79e33 100644
--- a/include/local.h
+++ b/include/local.h
@@ -74,6 +74,7 @@ typedef struct sndrv_seq_event snd_seq_event_t;
#define _snd_timer_status sndrv_timer_status
#include <sound/asound.h>
+#include <sound/asoundef.h>
#include <sound/asequencer.h>
#include "asoundlib.h"
#include "list.h"