1.1 --- a/Makefile	Sat Dec 29 11:19:37 2007 +0100
     1.2 +++ b/Makefile	Sat Dec 29 11:19:49 2007 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # PremiereEpg plugin to VDR
     1.6  #
     1.7 -# (C) 2005 Stefan Huelswitt <s.huelswitt@gmx.de>
     1.8 +# (C) 2005-2006 Stefan Huelswitt <s.huelswitt@gmx.de>
     1.9  #
    1.10  # This code is free software; you can redistribute it and/or
    1.11  # modify it under the terms of the GNU General Public License
    1.12 @@ -35,7 +35,6 @@
    1.13  
    1.14  ### The directory environment:
    1.15  
    1.16 -DVBDIR = ../../../../DVB
    1.17  VDRDIR = ../../..
    1.18  LIBDIR = ../../lib
    1.19  TMPDIR = /tmp
    1.20 @@ -46,7 +45,11 @@
    1.21  
    1.22  ### The version number of VDR (taken from VDR's "config.h"):
    1.23  
    1.24 -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
    1.25 +VDRVERSION = $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
    1.26 +APIVERSION = $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
    1.27 +ifeq ($(strip $(APIVERSION)),)
    1.28 +   APIVERSION = $(VDRVERSION)
    1.29 +endif
    1.30  
    1.31  ### The name of the distribution archive:
    1.32  
    1.33 @@ -55,7 +58,7 @@
    1.34  
    1.35  ### Includes and Defines (add further entries here):
    1.36  
    1.37 -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
    1.38 +INCLUDES += -I$(VDRDIR)/include
    1.39  
    1.40  DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
    1.41  
    1.42 @@ -87,7 +90,7 @@
    1.43  
    1.44  libvdr-$(PLUGIN).so: $(OBJS)
    1.45  	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
    1.46 -	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
    1.47 +	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
    1.48  
    1.49  dist: clean
    1.50  	@-rm -rf $(TMPDIR)/$(ARCHIVE)