diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2014-07-16 10:06:24 +0200 |
|---|---|---|
| committer | Wolfgang Schupp <w.schupp@a1.net> | 2014-07-16 10:06:24 +0200 |
| commit | 871564e1c99dbbbc742028fd63e4807577a56b31 (patch) | |
| tree | 346a6cdedce81baa1fdd7fc04a03f3c66e67f841 | |
| parent | 664817607b4943e4c999e9e4677b11190a52ff2e (diff) | |
| parent | fb16fb8a8bef785409359148eab6d415f20d11db (diff) | |
Merge pull request #5036 from Memphiz/fixffmpegsed
[depends/ffmpeg] - fix sed (didn't work on osx) - this fixes pkgconfig f...
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 51e191887f..0e08dcf1e5 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -62,7 +62,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig\npkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure + cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(ffmpg_config) |