From 0cca49db8b511243173c4d91759bcf96c99d2fab Mon Sep 17 00:00:00 2001 From: Justin Maggard Date: Tue, 26 Oct 2010 06:47:59 +0000 Subject: [PATCH] * Use DESTDIR instead of PREFIX, for GNU-standard packaging. * Add a couple extra lib dependencies needed by some environments. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5551805..f41b6fe 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # (c) 2008-2009 Justin Maggard # for use with GNU Make # To install use : -# $ PREFIX=/dummyinstalldir make install +# $ DESTDIR=/dummyinstalldir make install # or : # $ INSTALLPREFIX=/usr/local make install # or : @@ -21,9 +21,9 @@ CC = gcc RM = rm -f INSTALL = install -INSTALLPREFIX ?= $(PREFIX)/usr +INSTALLPREFIX ?= $(DESTDIR)/usr SBININSTALLDIR = $(INSTALLPREFIX)/sbin -ETCINSTALLDIR = $(PREFIX)/etc +ETCINSTALLDIR = $(DESTDIR)/etc BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoap.o \ upnpreplyparse.o minixml.o \ @@ -36,7 +36,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoap.o \ ALLOBJS = $(BASEOBJS) $(LNXOBJS) -LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -logg -lvorbis +LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o