diff -uNrBbE vdr-1.6.0/PLUGINS/src/skincurses/Makefile vdr-1.6.0-new/PLUGINS/src/skincurses/Makefile

--- vdr-1.6.0/PLUGINS/src/skincurses/Makefile	2008-01-19 14:40:33 +0300

+++ vdr-1.6.0-new/PLUGINS/src/skincurses/Makefile	2008-12-17 00:21:36 +0300

@@ -95,7 +95,7 @@

 ### Targets:

 libvdr-$(PLUGIN).so: $(OBJS)

-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@

+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@

 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean

diff -uNrBbE vdr-1.6.0/Makefile vdr-1.6.0-new/Makefile

--- vdr-1.6.0/Makefile	2008-12-17 00:22:05 +0300

+++ vdr-1.6.0-new/Makefile	2008-12-17 00:29:58 +0300

@@ -15,17 +15,18 @@

 CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses

 LSIDIR   = ./libsi

-DESTDIR ?=

-PREFIX  ?= /usr/local

+DESTDIR  = ${RPM_BUILD_ROOT}

+PREFIX   = /usr

 MANDIR   = $(PREFIX)/share/man

 BINDIR   = $(PREFIX)/bin

 INCLUDEDIR = $(PREFIX)/include

-LOCDIR   = ./locale

+LOCDIR   = $(PREFIX)/usr/share/locale/vdr

 LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)

 INCLUDES = $(shell pkg-config --cflags freetype2 fontconfig)

-PLUGINDIR= ./PLUGINS

+PLUGINDIR= $(LIBDIR)/vdr/plugins

 PLUGINLIBDIR= $(PLUGINDIR)/lib

+LOCALPLUGIN=./PLUGINS

 VIDEODIR = /video

 CONFDIR  = $(VIDEODIR)

@@ -174,21 +175,21 @@

 plugins: include-dir

 	@failed="";\

 	noapiv="";\

-	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\

+	for i in `ls $(LOCALPLUGIN)/src | grep -v '[^a-z0-9]'`; do\

 	    echo "Plugin $$i:";\

-	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\

+	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(LOCALPLUGIN)/src/$$i/Makefile" ; then\

 	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\

 	       noapiv="$$noapiv $$i";\

 	       continue;\

 	       fi;\

-	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\

+	    $(MAKE) -C "$(LOCALPLUGIN)/src/$$i" all || failed="$$failed $$i";\

 	    done;\

 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\

 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi

 clean-plugins:

-	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done

-	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)

+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(LOCALPLUGIN)/src/$$i" clean; done

+	@-rm -f $(LOCALPLUGIN)/lib/lib*-*.so.$(APIVERSION)

 # Install the files:

@@ -199,7 +200,7 @@

 install-bin: vdr

 	@mkdir -p $(DESTDIR)$(BINDIR)

-	@cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)

+	@cp vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)

 # Configuration files:

@@ -220,7 +221,7 @@

 install-plugins: plugins

 	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)

-	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)

+	@cp $(LOCALPLUGIN)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)

 # Headers: