diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile index 8539087f7..1785dd155 100644 --- a/XOrg/lib/libICE/Makefile +++ b/XOrg/lib/libICE/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libICE)) diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile index 7095ef88e..839e015b2 100644 --- a/XOrg/lib/libSM/Makefile +++ b/XOrg/lib/libSM/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libSM)) diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile index 2e07ff0c3..1bf729355 100644 --- a/XOrg/lib/libX11/Makefile +++ b/XOrg/lib/libX11/Makefile @@ -49,6 +49,7 @@ define Build/Compile make -C $(PKG_BUILD_DIR) mkdir -p $(PKG_INSTALL_DIR) DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR)) endef define Build/Configure @@ -80,9 +81,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libX11)) diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile index dbc25aec4..b7e018085 100644 --- a/XOrg/lib/libXau/Makefile +++ b/XOrg/lib/libXau/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXau)) diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile index a1e75ece0..4e4363f90 100644 --- a/XOrg/lib/libXaw/Makefile +++ b/XOrg/lib/libXaw/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXaw)) diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile index 5d2bcee99..dd99b7729 100644 --- a/XOrg/lib/libXcursor/Makefile +++ b/XOrg/lib/libXcursor/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXcursor)) diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile index 98d62252c..f08cbd21e 100644 --- a/XOrg/lib/libXdmcp/Makefile +++ b/XOrg/lib/libXdmcp/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXdmcp)) diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile index 774dc09b0..9a558dfd4 100644 --- a/XOrg/lib/libXext/Makefile +++ b/XOrg/lib/libXext/Makefile @@ -49,6 +49,7 @@ define Build/Compile make -C $(PKG_BUILD_DIR) mkdir -p $(PKG_INSTALL_DIR) DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR)) endef define Build/Configure @@ -80,8 +81,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR)) - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXext)) diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile index 513fee13f..57e570ba4 100644 --- a/XOrg/lib/libXfixes/Makefile +++ b/XOrg/lib/libXfixes/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXfixes)) diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile index 4c737e85c..495a63ec4 100644 --- a/XOrg/lib/libXfont/Makefile +++ b/XOrg/lib/libXfont/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXfont)) diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile index 66f9a7c17..84268fc46 100644 --- a/XOrg/lib/libXmu/Makefile +++ b/XOrg/lib/libXmu/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXmu)) diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile index 936c684b1..463dcb878 100644 --- a/XOrg/lib/libXpm/Makefile +++ b/XOrg/lib/libXpm/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXpm)) diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile index 688878b21..5a445a945 100644 --- a/XOrg/lib/libXrandr/Makefile +++ b/XOrg/lib/libXrandr/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXrandr)) diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile index 6ab270547..202be2594 100644 --- a/XOrg/lib/libXrender/Makefile +++ b/XOrg/lib/libXrender/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXrender)) diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile index 0113a3a31..02395a570 100644 --- a/XOrg/lib/libXt/Makefile +++ b/XOrg/lib/libXt/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(INSTALL_DIR) $(2)/bin mv $(1)/usr/bin/makestrs $(2)/bin endef diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile index 5d5e807b9..29ef1f3a9 100644 --- a/XOrg/lib/libXv/Makefile +++ b/XOrg/lib/libXv/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXv)) diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile index f61761993..072b65af2 100644 --- a/XOrg/lib/libXvMC/Makefile +++ b/XOrg/lib/libXvMC/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXvMC)) diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile index f4499365f..1676b6c2d 100644 --- a/XOrg/lib/libXxf86misc/Makefile +++ b/XOrg/lib/libXxf86misc/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXxf86misc)) diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile index e416954ff..4b37c3255 100644 --- a/XOrg/lib/libXxf86vm/Makefile +++ b/XOrg/lib/libXxf86vm/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libXxf86vm)) diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile index e361e5974..3b525bdbd 100644 --- a/XOrg/lib/libfontenc/Makefile +++ b/XOrg/lib/libfontenc/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libfontenc)) diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile index c738e1bd7..0de2cd45c 100644 --- a/XOrg/lib/libxkbfile/Makefile +++ b/XOrg/lib/libxkbfile/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libxkbfile)) diff --git a/XOrg/lib/libxkbui/Makefile b/XOrg/lib/libxkbui/Makefile index 4f32b609b..482fcdd82 100644 --- a/XOrg/lib/libxkbui/Makefile +++ b/XOrg/lib/libxkbui/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,libxkbui)) diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile index 721d38ff3..cfe59370f 100644 --- a/XOrg/lib/xtrans/Makefile +++ b/XOrg/lib/xtrans/Makefile @@ -80,7 +80,8 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef $(eval $(call BuildPackage,xtrans))