X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fgsm%2FMakefile;h=f3bf23e371ed40c18d567f1b8c6b981847a35483;hp=e1c6225f79d9e9ffd7b40954544f87bf15ffdcc0;hb=c1a60bf64e0fafb93caefa99b316b0cf91400af4;hpb=429205ff6e17a340a85c420d73aa5678ede426d6

diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile
index e1c6225f79..f3bf23e371 100644
--- a/libs/gsm/Makefile
+++ b/libs/gsm/Makefile
@@ -16,7 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0-pl10
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 PKG_MD5SUM:=4b148480f82e96d274248e13880ec873
-PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
@@ -26,27 +25,33 @@ define Package/libgsm
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A GSM transcoding library
-  DESCRIPTION:=A GSM 06.10 full-rate speech transcoding implementation (library).\\\
-    An implementation of the European GSM 06.10 provisional standard \\\
-    for full-rate speech transcoding, prI-ETS 300 036, which uses \\\
-    RPE/LTP (residual pulse excitation/long term prediction) coding \\\
-    at 13 kbit/s.
   URL:=ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 endef
 
+define Package/libgsm/description
+A GSM 06.10 full-rate speech transcoding implementation (library).
+	An implementation of the European GSM 06.10 provisional standard 
+	for full-rate speech transcoding, prI-ETS 300 036, which uses 
+	RPE/LTP (residual pulse excitation/long term prediction) coding 
+	at 13 kbit/s.
+endef
+
 define Package/gsm-utils
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libgsm
   TITLE:=GSM transcoding utilities
-  DESCRIPTION:=A GSM 06.10 full-rate speech transcoding implementation (utilities).\\\
-    An implementation of the European GSM 06.10 provisional standard \\\
-    for full-rate speech transcoding, prI-ETS 300 036, which uses \\\
-    RPE/LTP (residual pulse excitation/long term prediction) coding \\\
-    at 13 kbit/s.
   URL:=ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
 endef
 
+define Package/gsm-utils/description
+A GSM 06.10 full-rate speech transcoding implementation (utilities).
+	An implementation of the European GSM 06.10 provisional standard 
+	for full-rate speech transcoding, prI-ETS 300 036, which uses 
+	RPE/LTP (residual pulse excitation/long term prediction) coding 
+	at 13 kbit/s.
+endef
+
 define Build/Configure
 endef
 
@@ -62,26 +67,20 @@ define Build/Compile
 endef
 
 define Package/libgsm/install
-	install -d -m0755 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(1)/usr/lib/
 endef
 
 define Package/gsm-utils/install
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/gsm.h \
-		$(STAGING_DIR)/usr/lib/libgsm.{a,so*}
+	mkdir -p $(1)/usr/include/gsm
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(1)/usr/include/gsm/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libgsm))