Skip to content

Commit

Permalink
build: fix mistakes in previous build system updates
Browse files Browse the repository at this point in the history
  • Loading branch information
adamsutton committed Feb 21, 2013
1 parent 6b94edb commit 231e7b5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
5 changes: 3 additions & 2 deletions Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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)/%)
11 changes: 6 additions & 5 deletions 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

Expand All @@ -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

0 comments on commit 231e7b5

Please sign in to comment.