diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2013-01-06 18:48:29 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2013-01-06 18:48:29 +0100 |
| commit | 188fe74c8a1c917179baaf9d296c6d4eedf22c6f (patch) | |
| tree | 61d769b7d8c6348490cea7ef536de9ca6a0b6dde /newplugin | |
| parent | 36dfa5cb8f667c3f92d870977afcb6a1cfb91efe (diff) | |
| download | vdr-188fe74c8a1c917179baaf9d296c6d4eedf22c6f.tar.gz vdr-188fe74c8a1c917179baaf9d296c6d4eedf22c6f.tar.bz2 | |
Modified the Makefiles, by default VDR is now built according to the FHS
Diffstat (limited to 'newplugin')
| -rwxr-xr-x | newplugin | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: newplugin 2.15 2012/12/28 09:52:29 kls Exp $ +# $Id: newplugin 2.16 2013/01/06 12:22:25 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; @@ -76,8 +76,8 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc)) -LIBDIR = \$(DESTDIR)\$(call PKGCFG,libdir) -LOCDIR = \$(DESTDIR)\$(call PKGCFG,locdir) +LIBDIR = \$(call PKGCFG,libdir) +LOCDIR = \$(call PKGCFG,locdir) PLGCFG = \$(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -128,7 +128,7 @@ all: \$(SOFILE) i18n MAKEDEP = \$(CXX) -MM -MG DEPFILE = .dependencies \$(DEPFILE): Makefile - \@\$(MAKEDEP) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@ + \@\$(MAKEDEP) \$(CXXFLAGS) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@ -include \$(DEPFILE) @@ -137,7 +137,7 @@ DEPFILE = .dependencies PODIR = po I18Npo = \$(wildcard \$(PODIR)/*.po) I18Nmo = \$(addsuffix .mo, \$(foreach file, \$(I18Npo), \$(basename \$(file)))) -I18Nmsgs = \$(addprefix \$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file)))))) +I18Nmsgs = \$(addprefix \$(DESTDIR)\$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file)))))) I18Npot = \$(PODIR)/\$(PLUGIN).pot %.mo: %.po @@ -150,7 +150,7 @@ I18Npot = \$(PODIR)/\$(PLUGIN).pot msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$< \@touch \$\@ -\$(I18Nmsgs): \$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo +\$(I18Nmsgs): \$(DESTDIR)\$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo install -D -m644 \$< \$\@ .PHONY: i18n @@ -164,7 +164,7 @@ install-i18n: \$(I18Nmsgs) \$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@ install-lib: \$(SOFILE) - install -D \$^ \$(LIBDIR)/\$^.\$(APIVERSION) + install -D \$^ \$(DESTDIR)\$(LIBDIR)/\$^.\$(APIVERSION) install: install-lib install-i18n |