summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-01-22 23:05:23 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-01-22 23:05:23 (GMT)
commitfeccf81bb92f76668d107880f270988d3048cb42 (patch)
tree4edfd058bbb24ec626498d4d7315b6b6feb01c0e /src
parent045a091b196bd5457ddb78a5bdf33606bd662608 (diff)
downloadmxe-feccf81bb92f76668d107880f270988d3048cb42.zip
mxe-feccf81bb92f76668d107880f270988d3048cb42.tar.gz
mxe-feccf81bb92f76668d107880f270988d3048cb42.tar.bz2
improved escaping in the build rules of package qt
Diffstat (limited to 'src')
-rw-r--r--src/qt.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qt.mk b/src/qt.mk
index 02cc281..9aa2cd9 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -42,15 +42,15 @@ define $(PKG)_BUILD
-nomake docs \
-nomake translations
- $(MAKE) -C '$(1)'.native -j $(JOBS) sub-tools-bootstrap
- $(MAKE) -C '$(1)'.native -j $(JOBS) sub-moc
- $(MAKE) -C '$(1)'.native -j $(JOBS) sub-rcc
- $(MAKE) -C '$(1)'.native -j $(JOBS) sub-uic
+ $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-tools-bootstrap
+ $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-moc
+ $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-rcc
+ $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic
# rebuild qmake to use "-unix" as default and to use the correct "ar" command
$(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp
$(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp
- $(MAKE) -C '$(1)'.native/qmake -j $(JOBS)
+ $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)'
# install the native tools manually
$(INSTALL) -m755 '$(1)'.native/bin/moc '$(PREFIX)/bin/$(TARGET)-moc'
@@ -132,7 +132,7 @@ define $(PKG)_BUILD
-v
$(MAKE) -C '$(1)' -j '$(JOBS)'
- $(TARGET)-ranlib '$(1)'/lib/*.a
+ '$(TARGET)-ranlib' '$(1)'/lib/*.a
rm -rf '$(PREFIX)/$(TARGET)/mkspecs'
- $(MAKE) -C '$(1)' install
+ $(MAKE) -C '$(1)' -j 1 install
endef