From a0fa4f14a3e1e9af70b7b1fae66d4f06ef9ba263 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 26 Mar 2007 02:59:48 +0000 Subject: [PATCH] misc Build/UninstallDev fixes git-svn-id: svn://svn.openwrt.org/openwrt/packages@6703 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/libaudiofile/Makefile | 3 ++- libs/libmcrypt/Makefile | 2 +- libs/libsigc++/Makefile | 3 ++- libs/libupnp/Makefile | 3 ++- libs/ncurses/Makefile | 4 +++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile index 7d6ea4db5..8d0203959 100644 --- a/libs/libaudiofile/Makefile +++ b/libs/libaudiofile/Makefile @@ -64,11 +64,12 @@ endef define Build/UninstallDev rm -rf \ + $(STAGING_DIR)/usr/bin/audiofile-config \ $(STAGING_DIR)/usr/include/af_vfs.h \ $(STAGING_DIR)/usr/include/audiofile.h \ $(STAGING_DIR)/usr/include/aupvlist.h \ $(STAGING_DIR)/usr/lib/libaudiofile.{a,so*} \ - $(STAGING_DIR)/usr/lib/pkgconfig/libaudiofile.pc + $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc endef define Package/libaudiofile/install diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index 8e53eebe2..2bb94bea7 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -60,7 +60,7 @@ define Build/UninstallDev rm -rf \ $(STAGING_DIR)/usr/include/mcrypt.h \ $(STAGING_DIR)/usr/lib/libmcrypt.{a,so*} \ - $(STAGING_DIR)/usr/bin/mcrypt-config + $(STAGING_DIR)/usr/bin/libmcrypt-config endef define Package/libmcrypt/install diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile index b06e5ad9d..89ad6a815 100644 --- a/libs/libsigc++/Makefile +++ b/libs/libsigc++/Makefile @@ -54,7 +54,8 @@ define Build/UninstallDev rm -rf \ $(STAGING_DIR)/usr/include/sigc++-2.0 \ $(STAGING_DIR)/usr/lib/libsigc-2.0.* \ - $(STAGING_DIR)/usr/lib/sigc++-2.0 + $(STAGING_DIR)/usr/lib/sigc++-2.0 \ + $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc endef diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index 03798d714..8a60ed927 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -62,7 +62,8 @@ endef define Build/UninstallDev rm -rf \ $(STAGING_DIR)/usr/include/upnp \ - $(STAGING_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} + $(STAGING_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} \ + $(STAGING_DIR)/usr/lib/pkgconfig/libupnp.pc endef define Package/libupnp/install diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile index 7c67e4f3d..7745c5d1f 100644 --- a/libs/ncurses/Makefile +++ b/libs/ncurses/Makefile @@ -167,8 +167,10 @@ define Build/UninstallDev $(STAGING_DIR)/usr/include/panel.h \ $(STAGING_DIR)/usr/include/term{,cap}.h \ $(STAGING_DIR)/usr/include/unctrl.h \ + $(STAGING_DIR)/usr/include/form.h \ + $(STAGING_DIR)/usr/include/eti.h \ $(STAGING_DIR)/usr/lib/libcurses.so \ - $(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} + $(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} endef $(eval $(call BuildPackage,libncurses))