aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaylor Holberton <taylorcholberton@gmail.com>2016-11-24 12:13:58 -0500
committerGitHub <noreply@github.com>2016-11-24 12:13:58 -0500
commitf42051ce4de1a3b2655c2cab778338fe66ee9580 (patch)
treed043b214242fb78a37de35f04c7bcb76f8a2634a
parentad4d7d706c6c0b8e4233446fa545128af6c73002 (diff)
parentbd7ce64996ef45a45cc571a17c399d889d72a813 (diff)
Merge pull request #88 from dawagner/fix-includes-install-path
Fix install path of include files
-rw-r--r--Makefile6
-rw-r--r--src/Makefile1
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5ae7c62..ce7a79e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,11 @@ export DESTDIR ?=
export PREFIX ?= /usr/local
export CROSS_COMPILE =
-export INCDIR ?= $(PREFIX)/include
+export INCDIR ?= $(PREFIX)/include/tinyalsa
export LIBDIR ?= $(PREFIX)/lib
export BINDIR ?= $(PREFIX)/bin
export MANDIR ?= $(PREFIX)/share/man
-INCDIR ?= $(PREFIX)/include
-
.PHONY: all
all:
$(MAKE) -C src
@@ -23,7 +21,7 @@ clean:
.PHONY: install
install:
- install -d $(DESTDIR)$(INCDIR)/tinyalsa
+ install -d $(DESTDIR)$(INCDIR)/
install include/tinyalsa/pcm.h $(DESTDIR)$(INCDIR)/
install include/tinyalsa/mixer.h $(DESTDIR)$(INCDIR)/
install include/tinyalsa/asoundlib.h $(DESTDIR)$(INCDIR)/
diff --git a/src/Makefile b/src/Makefile
index 8bc5bda..da19c54 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,5 @@
DESTDIR ?=
PREFIX ?= /usr/local
-INCDIR ?= $(PREFIX)/include
LIBDIR ?= $(PREFIX)/lib
BINDIR ?= $(PREFIX)/bin
ifdef DEB_HOST_MULTIARCH