From 2402b14d17a8b65d79711b88a5e69592a14e0aa0 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 15 Feb 2010 16:31:51 +0100 Subject: [PATCH] Some libsdl-image cleanups --- libsdl-image/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libsdl-image/Makefile b/libsdl-image/Makefile index 27091d8..c0bf851 100644 --- a/libsdl-image/Makefile +++ b/libsdl-image/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.libsdl.org/projects/SDL_image/release/ PKG_MD5SUM:=6c06584b31559e2b59f2b982d0d1f628 PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_image-$(PKG_VERSION) +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libsdl-image @@ -38,21 +40,17 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ LIBS="-lSDL -ldirect -ldirectfb -lfusion" -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_image.h \ $(1)/usr/include/SDL/ $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libSDL_image*.{a,so*} \ $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ endef define Package/libsdl-image/install