Index: Makefile @@ -112,7 +112,7 @@ vdr: $(OBJS) $(SILIB) # The libsi library: $(SILIB): - $(MAKE) -C $(LSIDIR) all + $(MAKE) -C $(LSIDIR) all CC=${CC} CXX=${CXX} # pkg-config file: @@ -186,7 +186,7 @@ plugins: include-dir noapiv="$$noapiv $$i";\ continue;\ fi;\ - $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\ + $(MAKE) -C "$(PLUGINDIR)/src/$$i" all CC=${CC} CXX=${CXX} || failed="$$failed $$i";\ done;\ if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\ if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi @@ -197,7 +197,7 @@ clean-plugins: # Install the files: -install: install-bin install-conf install-doc install-plugins install-i18n install-includes install-pc +install: install-bin install-conf install-doc install-plugins install-includes install-pc # VDR binary: @@ -212,7 +212,6 @@ endif # Configuration files: install-conf: - @mkdir -p $(DESTDIR)$(VIDEODIR) @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\ mkdir -p $(DESTDIR)$(CONFDIR);\ cp *.conf $(DESTDIR)$(CONFDIR);\ @@ -228,7 +227,7 @@ install-doc: # Plugins: -install-plugins: plugins +install-plugins: #plugins @mkdir -p $(DESTDIR)$(PLUGINLIBDIR) ifdef FREEBSD @cp -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)