mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -278,8 +278,10 @@ fi
|
||||
# hack to define a short filename also for out-of-tree build
|
||||
if test `dirname $0` = `pwd` || test "$0" = ./configure; then
|
||||
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
|
||||
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__=__FILE__'
|
||||
else
|
||||
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
|
||||
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""'
|
||||
fi
|
||||
|
||||
AC_SUBST(HWLIB_CFLAGS)
|
||||
@@ -331,6 +333,7 @@ src/gui/Makefile
|
||||
src/gui/bedit/Makefile
|
||||
src/gui/components/Makefile
|
||||
src/gui/lua/Makefile
|
||||
src/gui/moviebrowser/Makefile
|
||||
src/gui/widget/Makefile
|
||||
src/system/Makefile
|
||||
src/system/mtdutils/Makefile
|
||||
|
Reference in New Issue
Block a user