more cleanups and build fixes

SVN-Revision: 9915

diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile
index 8539087f790fa5a6cfdfd6a4d6913cd82d42277d..1785dd15542422e7a66a790104b987cb0d7674e0 100644 (file)
--- 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 7095ef88e6c10b0510579efd2c1abd4020bf2401..839e015b2a665f7dce4494de0bab7685c4f656a4 100644 (file)
--- 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 2e07ff0c3047c6912ffa567a7d8cc58057f0ef3c..1bf729355ada73ca07fa50f2a3f67f3a70693f27 100644 (file)
--- 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 dbc25aec4ed0e938ee48696826b528ee0910a46e..b7e0180856a72f8a494f543b7bc0727f7e8dcc45 100644 (file)
--- 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 a1e75ece008ebd85b3b5ea0f9b443966dd3a7773..4e4363f9072ead96c2d95b0117e7fc0367aa1933 100644 (file)
--- 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 5d2bcee998cc6fc58d6e1be53bed8423eef03a2a..dd99b772962430da77f2edb23eacddd065a08214 100644 (file)
--- 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 98d62252c0ef655b75ecd42834277417dcd4e16f..f08cbd21e7cd527b4704a6d0e65e67958cf7f2ff 100644 (file)
--- 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 774dc09b0bed0efaad25c19dba18e72f6600bfe3..9a558dfd407c2cd3a49f94cd338265a4105aae21 100644 (file)
--- 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 513fee13fd9fc121862188d326b1ec761cf2b9be..57e570ba4adec5bccc7f8e48713dbb63637b4f7a 100644 (file)
--- 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 4c737e85ccf2620cb267c51c3becf1a470744c68..495a63ec47eccefb23046829f9e9c1e41bddc9ee 100644 (file)
--- 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 66f9a7c177c721e1a8dc8208c2bf71b28bb8385f..84268fc469cc148979d40235230b1c937b98e7d7 100644 (file)
--- 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 936c684b18101d0f81b946d41ffaf1faa4e038bd..463dcb8780e2ca0516aabd8b4870500741cad9de 100644 (file)
--- 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 688878b21c48f987c75488fe3224501b8eab1af0..5a445a9451dd72983ee4cfa0e21e65c3b8d60f37 100644 (file)
--- 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 6ab27054715ecef8b09a34c2701b0f112cd58456..202be2594ac6b0207394d64ff6cac92c9f7916a4 100644 (file)
--- 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 0113a3a316ea4d03c7659bd8f899d15aca13212e..02395a5705b16e66377e7f65c1c3c4cace15ac2d 100644 (file)
--- 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 5d5e807b9793063bf3d05303abb9039c77823d77..29ef1f3a93a1ab429aecc4ce00080ad2f017dd95 100644 (file)
--- 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 f617619938d4627f9f9621123846276bae1e9e84..072b65af2e9aa69ccee70482a1594ca82f5d0cf3 100644 (file)
--- 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 f4499365f5837d0b52ba708442ce02a6320af00f..1676b6c2d061dfa5a3afab45efbd599d89123fa3 100644 (file)
--- 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 e416954ff2460c2dccf3b84d5a0385fb4a73022a..4b37c325587f62ea5ba77c45e74df48d1b07c02c 100644 (file)
--- 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 e361e5974837385d4ef750438bd2d05944aba830..3b525bdbda7f1bdc1e1c4b493ec390dbcbf86c6d 100644 (file)
--- 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 c738e1bd792784bac3388566cba7b90a982a73ac..0de2cd45c6a806f00e49fadcfe001a5b0d4f9e09 100644 (file)
--- 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 4f32b609bd66424e122266f9a31b15c87b311f56..482fcdd826e5ac46b8a36f179bbc3ac28085bceb 100644 (file)
--- 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 721d38ff32697d7802337bd88e56782b8ef48986..cfe59370fe68cc3fe74c6d163df90651f302c859 100644 (file)
--- 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))