disabled compile from included plugins, we dont support this way on gentoo support for linguas handling fixed install an multicore cpu changed path to install header files in own dir vdr, libsi Signed-of-by: Joerg Bornkessel (2013/03/30) diff -Naur vdr-1.7.42.orig/Makefile vdr-1.7.42/Makefile --- vdr-1.7.42.orig/Makefile 2013-03-30 21:19:19.000000000 +0100 +++ vdr-1.7.42/Makefile 2013-03-30 21:24:47.000000000 +0100 @@ -109,7 +109,7 @@ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) -all: vdr i18n plugins +all: vdr i18n # Implicit rules: @@ -162,7 +162,7 @@ PODIR = po LOCALEDIR = locale -I18Npo = $(wildcard $(PODIR)/*.po) +I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po)) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/vdr.pot @@ -185,7 +185,7 @@ install-i18n: i18n @mkdir -p $(DESTDIR)$(LOCDIR) - cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) + @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done) # The 'include' directory (for plugins): @@ -247,7 +247,7 @@ # Install the files (note that 'install-pc' must be first!): -install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes +install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes # VDR binary: @@ -259,11 +259,12 @@ install-dirs: @mkdir -p $(DESTDIR)$(VIDEODIR) - @mkdir -p $(DESTDIR)$(CONFDIR) +# @mkdir -p $(DESTDIR)$(CONFDIR) @mkdir -p $(DESTDIR)$(CACHEDIR) @mkdir -p $(DESTDIR)$(RESDIR) install-conf: + @mkdir -p $(DESTDIR)$(CONFDIR) @cp -pn *.conf $(DESTDIR)$(CONFDIR) # Documentation: @@ -290,8 +291,11 @@ # Includes: install-includes: include-dir - @mkdir -p $(DESTDIR)$(INCDIR) - @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) +# @mkdir -p $(DESTDIR)$(INCDIR) +# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) + @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi + @cp -pLR include/vdr $(DESTDIR)$(INCDIR) + @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr # pkg-config file: