diff options
| author | the-hydra <xphile@gmx.us> | 2015-05-24 15:41:38 +1000 |
|---|---|---|
| committer | the-hydra <xphile@gmx.us> | 2015-05-24 15:41:38 +1000 |
| commit | 2386c435f79f17dca4b201adfb51eae54e1c9a77 (patch) | |
| tree | 4e2956bdcca1119b227c2e8131a9b537aaa9e8fa /Makefile.in | |
| parent | a26eb2840d1d71e624794734e22a3dd9a6dfa2cd (diff) | |
Fixed makefile ARCH install bug
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 03175674f2..25be962a27 100644 --- a/Makefile.in +++ b/Makefile.in @@ -573,7 +573,7 @@ install-datas: install-scripts @# Arch independent files ifeq ($(findstring bsd,@ARCH@), bsd) @find -E addons media userdata system -type f \ - -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \ + -not -iregex ".*-@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \ -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/@APP_NAME_LC@/\`dirname '{}'\`\"" \; \ -and \ -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/"{}" \; \ @@ -581,13 +581,13 @@ ifeq ($(findstring bsd,@ARCH@), bsd) else ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) @find -E addons media userdata system -type f \ - -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \ + -not -iregex ".*-@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \ -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \ -and \ -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \ -exec printf " -- %-75.75s\r" "{}" \; else - @find addons media userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" + @find addons media userdata system -regextype posix-extended -type f -not -iregex ".*-@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.so\.[0-9].*|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" endif endif @# Icons and links |