reverse the invocation order of CCTOOL_INSTALL and fakeroot
authorTimo Savola <tsavola@movial.fi>
Wed, 21 May 2008 16:21:46 +0000 (19:21 +0300)
committerTimo Savola <tsavola@movial.fi>
Wed, 21 May 2008 16:21:46 +0000 (19:21 +0300)
scripts/styles/autotools.mk
scripts/styles/custom.mk
scripts/styles/make.mk

index c9feb76c8b454c805803b2251a1448719428fa07..629bb246be2151dc81553eba9ded4df13368c2e8 100644 (file)
@@ -84,9 +84,9 @@ endif
 
 __install:
 ifdef MATRIX_OBJ_DIR
-       @cd $(MATRIX_OBJ_DIR) && $(MATRIX_INSTALL_ENV) $(FAKEROOT_INSTALL) $(CCTOOL_INSTALL) $(MAKE) install $(MATRIX_INSTALL_ARGS)
+       @cd $(MATRIX_OBJ_DIR) && $(MATRIX_INSTALL_ENV) $(CCTOOL_INSTALL) $(FAKEROOT_INSTALL) $(MAKE) install $(MATRIX_INSTALL_ARGS)
 else
-       @$(MATRIX_INSTALL_ENV) $(FAKEROOT_INSTALL) $(CCTOOL_INSTALL) $(MAKE) install $(MATRIX_INSTALL_ARGS)
+       @$(MATRIX_INSTALL_ENV) $(CCTOOL_INSTALL) $(FAKEROOT_INSTALL) $(MAKE) install $(MATRIX_INSTALL_ARGS)
 endif
 
 
index 0523d7d1682de6db12cbd6e7b6a8117cf4a149af..7c846a79f2ada12e03d094e581666df181f1a777 100644 (file)
@@ -17,4 +17,4 @@ __build: __configure build
 
 # this can't have any requisites as that would trigger a rebuild
 __install:
-       @$(FAKEROOT_INSTALL) $(CCTOOL_INSTALL) $(MAKE) -f meta/plug install
+       @$(CCTOOL_INSTALL) $(FAKEROOT_INSTALL) $(MAKE) -f meta/plug install
index 7bd898403dcc1ffb2f19d5f1cbe471de1dc3152f..e9b47edc257b1e5f4eedaf1e2e97cde3ab29a9c7 100644 (file)
@@ -11,6 +11,6 @@ __matrix_build:
        @$(CCTOOL_BUILD) $(MAKE) $(MATRIX_BUILD_ARGS)
 
 __matrix_install:
-       @$(FAKEROOT_INSTALL) $(CCTOOL_INSTALL) $(MAKE) $(MATRIX_INSTALL_ARGS) install
+       @$(CCTOOL_INSTALL) $(FAKEROOT_INSTALL) $(MAKE) $(MATRIX_INSTALL_ARGS) install
 
 .PHONY: __matrix_build __matrix_install