more cleanups and build fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9915 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile
index 8539087..1785dd1 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 7095ef8..839e015 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 2e07ff0..1bf7293 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 dbc25ae..b7e0180 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 a1e75ec..4e4363f 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 5d2bcee..dd99b77 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 98d6225..f08cbd2 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 774dc09..9a558df 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 513fee1..57e570b 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 4c737e8..495a63e 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 66f9a7c..84268fc 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 936c684..463dcb8 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 688878b..5a445a9 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 6ab2705..202be25 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 0113a3a..02395a5 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 5d5e807..29ef1f3 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 f617619..072b65a 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 f449936..1676b6c 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 e416954..4b37c32 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 e361e59..3b525bd 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 c738e1b..0de2cd4 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 4f32b60..482fcdd 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 721d38f..cfe5937 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))