[vlc-devel] commit: Contribs: Use $STRIP (Christophe Mutricy )
git version control
git at videolan.org
Thu Aug 27 19:34:44 CEST 2009
vlc | branch: 1.0-bugfix | Christophe Mutricy <xtophe at videolan.org> | Thu Jun 18 19:52:39 2009 +0200| [797ac307bb127f346876b6f6ac6a7ef7b2562fa5] | committer: Rémi Denis-Courmont
Contribs: Use $STRIP
And don't ignore errors
(cherry picked from commit 17a09405c95557663437d77c47a49ce46fa658f8)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=797ac307bb127f346876b6f6ac6a7ef7b2562fa5
---
extras/contrib/src/Makefile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 83ef624..5e88d8a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -658,12 +658,12 @@ lua: lua-$(LUA_VERSION).tar.gz
.lua: lua
ifdef HAVE_WIN32
- ( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;)
- (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
- (cd $<; sed -i.orig 's at prefix= /usr/local at prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
+ ( cd $< && sed -i.orig 's/lua luac/lua.exe/' Makefile && cd src && sed -i.orig 's/CC=/#CC=/' Makefile && sed -i 's/strip/\$(STRIP)/' Makefile && cd ../..)
+ (cd $<&& $(HOSTCC) make $(LUA_MAKEPLATEFORM)&& cd src&& $(HOSTCC) make liblua.a&& cd ..&&$(HOSTCC) make install INSTALL_TOP=$(PREFIX)&& $(RANLIB) $(PREFIX)/lib/liblua.a)
+ (cd $<&& sed -i.orig 's at prefix= /usr/local at prefix= $(PREFIX)@' etc/lua.pc&& mkdir -p $(PREFIX)/lib/pkgconfig&& cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
else
- (cd $<; patch -p1) < Patches/lua-noreadline.patch
- (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
+ (cd $<&& patch -p1) < Patches/lua-noreadline.patch
+ (cd $<&& $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
endif
touch $@
More information about the vlc-devel
mailing list