Index: radix-1.9/X11/libs/qt5/5.15.8/Makefile
===================================================================
--- radix-1.9/X11/libs/qt5/5.15.8/Makefile (revision 354)
+++ radix-1.9/X11/libs/qt5/5.15.8/Makefile (revision 355)
@@ -848,7 +848,9 @@
# ======= Install config.summary =======
@cat $(SRC_DIR)/config.summary \
> $(QT5_PKG)/usr/share/doc/$(doc_dir_name)/config.summary
- # ======= Install qt.conf file for QMake =======
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(QT5_PKG))
+ # ======= Install qt.conf file =======
@mkdir -p $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin
@echo "" > $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
@echo "[EffectivePaths]" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
@@ -895,8 +897,6 @@
@echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
@echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
@echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
- # ======= Install the same to $(TARGET_DEST_DIR) =======
- $(call install-into-devenv, $(QT5_PKG))
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_PKG)/usr/bin/$(TARGET)-*
@rm -f $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/$(TARGET)-*
Index: radix-1.9/X11/libs/qt5/5.15.8-ppc32/Makefile
===================================================================
--- radix-1.9/X11/libs/qt5/5.15.8-ppc32/Makefile (revision 354)
+++ radix-1.9/X11/libs/qt5/5.15.8-ppc32/Makefile (revision 355)
@@ -663,7 +663,9 @@
@cat $(profile_dir)/qt5.csh.in | sed "s,@LIBDIRSUFFIX@,$(MULTILIB_PPC32_SUFFIX),g" > $(QT5_32_PKG)/etc/profile.d/32/qt5.csh
@cat $(profile_dir)/qt5.sh.in | sed "s,@LIBDIRSUFFIX@,$(MULTILIB_PPC32_SUFFIX),g" > $(QT5_32_PKG)/etc/profile.d/32/qt5.sh
@chmod 0755 $(QT5_32_PKG)/etc/profile.d/32/*
- # ======= Install qt.conf file for QMake =======
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(QT5_32_PKG))
+ # ======= Install qt.conf file =======
@mkdir -p $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin
@echo "" > $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
@echo "[EffectivePaths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
@@ -710,8 +712,6 @@
@echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
@echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
@echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
- # ======= Install the same to $(TARGET_DEST_DIR) =======
- $(call install-into-devenv, $(QT5_32_PKG))
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_32_PKG)/usr/bin/32/$(TARGET32)-*
@rm -f $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/$(TARGET32)-*
Index: radix-1.9/X11/libs/qt5/5.15.8-x86_32/Makefile
===================================================================
--- radix-1.9/X11/libs/qt5/5.15.8-x86_32/Makefile (revision 354)
+++ radix-1.9/X11/libs/qt5/5.15.8-x86_32/Makefile (revision 355)
@@ -660,7 +660,9 @@
@cat $(profile_dir)/qt5.csh.in | sed "s,@LIBDIRSUFFIX@,$(MULTILIB_X86_32_SUFFIX),g" > $(QT5_32_PKG)/etc/profile.d/32/qt5.csh
@cat $(profile_dir)/qt5.sh.in | sed "s,@LIBDIRSUFFIX@,$(MULTILIB_X86_32_SUFFIX),g" > $(QT5_32_PKG)/etc/profile.d/32/qt5.sh
@chmod 0755 $(QT5_32_PKG)/etc/profile.d/32/*
- # ======= Install qt.conf file for QMake =======
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(QT5_32_PKG))
+ # ======= Install qt.conf file =======
@mkdir -p $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin
@echo "" > $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
@echo "[EffectivePaths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
@@ -707,8 +709,6 @@
@echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
@echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
@echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
- # ======= Install the same to $(TARGET_DEST_DIR) =======
- $(call install-into-devenv, $(QT5_32_PKG))
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_32_PKG)/usr/bin/32/$(TARGET32)-*
@rm -f $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/$(TARGET32)-*