diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-04-25 10:24:45 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2016-04-25 10:24:45 +0200 |
| commit | 4b3b39d2dbdb2b0d8e2f1a3b1fbbec5de9aaeca3 (patch) | |
| tree | ff4955a0962e7b09500a700fb1c39a6ccbf6b4a3 | |
| parent | 96524c250673e759cfe956db3ef9d7974b578f86 (diff) | |
| parent | fc4eeaa90998176df9a7d40c8da5732b84db72de (diff) | |
Merge pull request #9414 from MaxKellermann/build
Various minor build fixes
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | codegenerator.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tools/depends/target/xbmc/Makefile | 2 |
4 files changed, 9 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index 972e0529da..011410c2a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -512,9 +512,7 @@ install-scripts: install-datas: install-scripts @echo "Copying support and legal files..." @install -d $(DESTDIR)$(docdir) - @for FILE in `ls LICENSE.GPL *.txt`; do \ - install -m 0644 "$$FILE" "$(DESTDIR)$(docdir)/$$FILE"; done - @install -m 0644 "docs/README.linux" "$(DESTDIR)$(docdir)/README.linux" + @install -m 0644 docs/README.linux LICENSE.GPL *.txt $(DESTDIR)$(docdir) @echo "Done!" @echo "Copying system files to $(DESTDIR)$(datarootdir)/@APP_NAME_LC@" @install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@ @@ -563,15 +561,9 @@ endif @echo "Copying bindings to $(DESTDIR)$(includedir)/@APP_NAME_LC@" @install -d $(DESTDIR)$(includedir)/@APP_NAME_LC@ - @for f in $(BINDINGS); do \ - install -m 0644 $$f $(DESTDIR)$(includedir)/@APP_NAME_LC@ ; \ - done - @for f in project/cmake/*.cmake; do \ - install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \ - done - @for f in project/cmake/scripts/common/*.cmake; do \ - install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \ - done + @install -m 0644 $(BINDINGS) $(DESTDIR)$(includedir)/@APP_NAME_LC@ + @install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@ + @install -m 0644 project/cmake/*.cmake project/cmake/scripts/common/*.cmake $(DESTDIR)$(libdir)/@APP_NAME_LC@ @cd $(DESTDIR)$(includedir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc uninstall: diff --git a/codegenerator.mk b/codegenerator.mk index 2af2128a3b..01f80e388b 100644 --- a/codegenerator.mk +++ b/codegenerator.mk @@ -74,7 +74,7 @@ $(SWIG): $(GENERATED_JSON): $(JSON_BUILDER) @echo Jsonbuilder: $(JSON_BUILDER) - $(MAKE) -C $(INTERFACES_DIR)/json-rpc $(notdir $@) + $(MAKE) -C $(INTERFACES_DIR)/json-rpc $(@F) $(JSON_BUILDER): ifeq ($(BOOTSTRAP_FROM_DEPENDS), yes) @@ -82,5 +82,5 @@ ifeq ($(BOOTSTRAP_FROM_DEPENDS), yes) @false else #build json builder - ".." because makefile is in the parent dir of "bin" - $(MAKE) -C $(abspath $(dir $@)..) + $(MAKE) -C $(abspath $(@D)/..) endif diff --git a/configure.ac b/configure.ac index c4e83a23fc..7340b62604 100644 --- a/configure.ac +++ b/configure.ac @@ -1946,8 +1946,8 @@ else final_message="$final_message\n MID Support:\tNo" fi -ORIGCC=$CC -ORIGCXX=$CXX +ORIGCC="$CC" +ORIGCXX="$CXX" if test "x$use_ccache" != "xno"; then AC_PATH_PROG(CCACHE,ccache,none) if test "$ac_cv_path_CCACHE" = "none"; then diff --git a/tools/depends/target/xbmc/Makefile b/tools/depends/target/xbmc/Makefile index 622ffc17cb..a1895255bb 100644 --- a/tools/depends/target/xbmc/Makefile +++ b/tools/depends/target/xbmc/Makefile @@ -32,7 +32,7 @@ debug: $(SOURCE)/lib$(APP_NAME).so $(SOURCE)/lib$(APP_NAME).so: cd $(SOURCE); BOOTSTRAP_FROM_DEPENDS=yes ./bootstrap - cd $(SOURCE); echo $(CONFIGURE) + cd $(SOURCE); $(CONFIGURE) ../../Makefile.include: $(error Please run configure) |