Mercurial > mxe-octave

changeset 659:c96eeb56f5de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved escaping in the build rules of package qt
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 23 Jan 2010 00:05:23 +0100
parents b1d03b91eb1e
children f77810598227
files src/qt.mk
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Fri Jan 22 03:53:37 2010 +0100
+++ b/src/qt.mk	Sat Jan 23 00:05:23 2010 +0100
@@ -42,15 +42,15 @@
         -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 @@
         -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