summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-01-18 12:40:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-01-18 12:40:17 +0100
commitfbe4f2a0568a1bf893f2bf970edcbb3d345e5db5 (patch)
treef6fe25555abc1fbcce6e2d62030fcdfbf632562e /Makefile
parent6469b666bd15110091da0a23a3f4e25a481b0ef7 (diff)
downloadvdr-fbe4f2a0568a1bf893f2bf970edcbb3d345e5db5.tar.gz
vdr-fbe4f2a0568a1bf893f2bf970edcbb3d345e5db5.tar.bz2
Some improvements to the Makefiles
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ea34eac1..93a51125 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.23 2012/01/14 13:02:21 kls Exp $
+# $Id: Makefile 2.24 2012/01/18 12:19:37 kls Exp $
.DELETE_ON_ERROR:
@@ -17,10 +17,10 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
LSIDIR = ./libsi
DESTDIR ?=
PREFIX ?= /usr/local
-MANDIR = $(PREFIX)/share/man
-BINDIR = $(PREFIX)/bin
-INCDIR = $(PREFIX)/include
-LOCDIR = ./locale
+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)
@@ -30,7 +30,7 @@ PLUGINLIBDIR= $(PLUGINDIR)/lib
VIDEODIR = /video
CONFDIR = $(VIDEODIR)
-DOXYGEN = /usr/bin/doxygen
+DOXYGEN ?= /usr/bin/doxygen
DOXYFILE = Doxyfile
PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
@@ -246,4 +246,3 @@ clean:
-rm -rf include
-rm -rf srcdoc
CLEAN: clean
-