Cleanup xbitmaps.

SVN-Revision: 13664

diff --git a/Xorg/xorg/data/xbitmaps/Makefile b/Xorg/xorg/data/xbitmaps/Makefile
index 8cbfe1d0760ade4be7c6c05506281d6238849dd6..d61df83550f4ef299095f2c5b727ac246f32f424 100644 (file)
--- a/Xorg/xorg/data/xbitmaps/Makefile
+++ b/Xorg/xorg/data/xbitmaps/Makefile
@@ -7,13 +7,15 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-PKG_BASE_NAME:=xbitmaps

 PKG_NAME:=xbitmaps
 PKG_NAME:=xbitmaps

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_VERSION:=1.0.1
 PKG_VERSION:=1.0.1

-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/data/
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/data/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

+PKG_MD5SUM:=b28a9840cde3c38d7c09716372fea257
+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -21,41 +23,25 @@ define Package/xbitmaps
   SECTION:=xorg-data
   CATEGORY:=Xorg
   SUBMENU:=data
   SECTION:=xorg-data
   CATEGORY:=Xorg
   SUBMENU:=data

-  DEPENDS:=

   TITLE:=xbitmaps
   URL:=http://xorg.freedesktop.org/
 endef
 
 define Build/InstallDev
   TITLE:=xbitmaps
   URL:=http://xorg.freedesktop.org/
 endef
 
 define Build/InstallDev

-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-#ifeq (libXext,libX11)
-# CONFIGURE_ARGS_XTRA=--without-xcb
-#endif
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) ; \
-       fi \
-       )
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/bitmaps}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \
+               $(1)/usr/include/X11/bitmaps/

 endef
 
 define Package/xbitmaps/install/Default
        $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps
 endef
 
 define Package/xbitmaps/install/Default
        $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps

-       $(CP) $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* $(1)/usr/include/X11/bitmaps
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \
+               $(1)/usr/include/X11/bitmaps

 endef
 
 $(eval $(call BuildPackage,xbitmaps))
 endef
 
 $(eval $(call BuildPackage,xbitmaps))