From: Jean-Baptiste Kempf Date: Fri, 6 Apr 2007 21:45:17 +0000 (+0000) Subject: Contribs - qt4 bin/*.exe and bin/* X-Git-Tag: 0.9.0-test0~7796 X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=e6893d71617851d11ecb2d09f1a7d8fa326b5801;ds=sidebyside Contribs - qt4 bin/*.exe and bin/* --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index c869f4e6f3..f9d3159f17 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1378,7 +1378,12 @@ qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz .qt4: qt4 - (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin) + (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) +ifeq( $(BUILD), i686-pc-cygwin ) + (cd qt4;cp bin/rcc.exe bin/uic.exe bin/moc.exe $(PREFIX)/bin) +else + (cd qt4;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin) +endif touch $@ CLEAN_FILE += .qt4