From: Hans Zandbelt <hans.zandbelt@gmail.com>
Date: Sun, 1 Feb 2009 16:43:09 +0000 (+0000)
Subject: avoid installing asterisk 1.6.x header files in staging dirs since they conflict... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b6527ebc2cbe2130d61758d738ff86424a7b31d5;p=openwrt%2Fsvn-archive%2Farchive.git

avoid installing asterisk 1.6.x header files in staging dirs since they conflict with 1.4.x addons

SVN-Revision: 14343
---

diff --git a/net/asterisk-1.6.x/Makefile b/net/asterisk-1.6.x/Makefile
index 7c976e5a10..9adf71661a 100644
--- a/net/asterisk-1.6.x/Makefile
+++ b/net/asterisk-1.6.x/Makefile
@@ -57,7 +57,7 @@ endef
 define Package/asterisk16
 $(call Package/asterisk16/Default)
   TITLE:=Complete open source PBX
-  DEPENDS:= +libncurses +libpopt +libpthread +zlib @!TARGET_avr32
+  DEPENDS:= +libncurses +libpopt +libpthread +zlib @!TARGET_avr32 @!PACKAGE_asterisk14
 endef
 
 define Package/asterisk16/description
@@ -162,11 +162,11 @@ define Build/Compile
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf
 endef
 
-define Build/InstallDev
-	mkdir -p $(1)/usr/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/
-endef
+#define Build/InstallDev
+#	mkdir -p $(1)/usr/include/asterisk/
+#	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk/
+#	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/
+#endef
 
 define Package/asterisk16/conffiles
 /etc/asterisk/asterisk.conf