summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--Makefile11
3 files changed, 11 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a9c74f5a..54ca7cdb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1893,6 +1893,7 @@ Ville Skyttä <ville.skytta@iki.fi>
for adding Language and fixing Language-Team header of *.po
for fixing the Language header of the Serbian translation file
for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
+ for making the Makefile also install the include files
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 195ae843..220d094f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6602,3 +6602,4 @@ Video Disk Recorder Revision History
- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
- Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
to Ville Skyttä).
+- The Makefile now also installs the include files (thanks to Ville Skyttä).
diff --git a/Makefile b/Makefile
index 8e6b80cb..93178392 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 2.16 2011/04/17 13:29:01 kls Exp $
+# $Id: Makefile 2.17 2011/04/17 13:35:53 kls Exp $
.DELETE_ON_ERROR:
@@ -19,6 +19,7 @@ DESTDIR ?=
PREFIX ?= /usr/local
MANDIR = $(PREFIX)/share/man
BINDIR = $(PREFIX)/bin
+INCDIR = $(PREFIX)/include
LOCDIR = ./locale
LIBS = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
@@ -162,7 +163,7 @@ clean-plugins:
# Install the files:
-install: install-bin install-conf install-doc install-plugins install-i18n
+install: install-bin install-conf install-doc install-plugins install-i18n install-includes
# VDR binary:
@@ -193,6 +194,12 @@ install-plugins: plugins
@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
+# Includes:
+
+install-includes: include-dir
+ @mkdir -p $(DESTDIR)$(INCDIR)
+ @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
+
# Source documentation:
srcdoc: