build: fix mistakes in previous build system updates

diff --git a/Makefile b/Makefile
index 1498467eb978d2502feb505d76f990a3900bab7b..ac9a3e89484e7bb97ba44a64b2140a6f19020f62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ SRCS-${CONFIG_BUNDLE}     += bundle.c
 BUNDLES-yes               += docs/html docs/docresources src/webui/static
 BUNDLES-yes               += data/conf
 BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
-BUNDLES                    = $(BUNDLES-yes:%=$(ROOTDIR)/%)
+BUNDLES                    = $(BUNDLES-yes)
 
 #
 # Add-on modules
@@ -272,6 +272,7 @@ distclean: clean
        rm -f ${ROOTDIR}/.config.mk
 
 # Create version
+$(BUILDDIR)/src/version.o: $(ROOTDIR)/src/version.c
 $(ROOTDIR)/src/version.c: FORCE
        @$(ROOTDIR)/support/version $@ > /dev/null
 FORCE:
@@ -289,4 +290,4 @@ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
 
 $(BUILDDIR)/bundle.c:
        @mkdir -p $(dir $@)
-       $(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES)
+       $(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)

diff --git a/support/posix.mk b/support/posix.mk
index f77677d73638ae19cd6d8bf038320f6fa951f5be..03e772da73175730abebfcbed683474bf50ce084 100644 (file)
--- a/support/posix.mk
+++ b/support/posix.mk
@@ -1,5 +1,5 @@
-MAN = man/tvheadend.1
-ICON = support/gnome/tvheadend.svg
+MAN = $(ROOTDIR)/man/tvheadend.1
+ICON = $(ROOTDIR)/support/gnome/tvheadend.svg
 
 INSTICON= ${DESTDIR}$(prefix)/share/icons/hicolor/scalable/apps
 
@@ -10,11 +10,12 @@ install: ${PROG} ${MAN}
 
        for bundle in ${BUNDLES}; do \
                mkdir -p ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
-               cp -r $$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
+               cp -r $(ROOTDIR)/$$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
        done
 
        find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true
 
 uninstall:
-       rm -f ${DESTDIR}${bindir)/tvheadend
-       rm -f ${DESTDIR}${mandir)/tvheadend.1
+       rm -f ${DESTDIR}${bindir}/tvheadend
+       rm -f ${DESTDIR}${mandir}/tvheadend.1
+       rm -rf ${DESTDIR}${datadir}/tvheadend