xupnpd: Update to latest version, switch to procd and add parameter for root directory
[openwrt/svn-archive/archive.git] / multimedia / minidlna / patches / 020-makefile-tweaks.patch
1 --- a/Makefile
2 +++ b/Makefile
3 @@ -10,19 +10,23 @@
4 # or :
5 # $ make install
6 #
7 +PREFIX ?= /usr
8 +ICONV_PREFIX ?= $(PREFIX)
9 +INTL_PREFIX ?= $(PREFIX)
10 #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
11 #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
12 CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
13 - -I/usr/include/ffmpeg \
14 - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
15 - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
16 + -I$(PREFIX)/include/ffmpeg \
17 + -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec -I$(PREFIX)/include/libavformat \
18 + -I$(PREFIX)/include/ffmpeg/libavutil -I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat
19 +
20 #STATIC_LINKING: CFLAGS += -DSTATIC
21 #STATIC_LINKING: LDFLAGS = -static
22 CC = gcc
23 RM = rm -f
24 INSTALL = install
25
26 -INSTALLPREFIX ?= $(DESTDIR)/usr
27 +INSTALLPREFIX ?= $(DESTDIR)$(PREFIX)
28 SBININSTALLDIR = $(INSTALLPREFIX)/sbin
29 ETCINSTALLDIR = $(DESTDIR)/etc
30
31 @@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
32
33 ALLOBJS = $(BASEOBJS) $(LNXOBJS)
34
35 -LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis
36 +LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS)
37 #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
38
39 TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
40 @@ -64,7 +68,7 @@ install-conf:
41 $(INSTALL) -d $(ETCINSTALLDIR)
42 $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
43
44 -minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
45 +minidlna: $(BASEOBJS) $(LNXOBJS)
46 @echo Linking $@
47 @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
48