From 72a8d995af95b2c42b3bfb32c5f01882e720ae00 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <dev@nanl.de>
Date: Tue, 2 Mar 2010 17:44:03 +0100
Subject: [PATCH] cleanup Makefile, change install-paths

---
 stardict/Makefile | 68 ++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/stardict/Makefile b/stardict/Makefile
index 47b915c..40a5d8a 100644
--- a/stardict/Makefile
+++ b/stardict/Makefile
@@ -35,41 +35,47 @@ TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include
 TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/libintl/lib
 TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
-CONFIGURE_CMD=./autogen.sh
+CONFIGURE_CMD =./autogen.sh
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-	        --disable-dependency-tracking \
-		--disable-libtool-lock \
-		--disable-spell \
-		--disable-gucharmap \
-		--disable-festival \
-		--disable-espeak \
-		--disable-dictdotcn \
-		--disable-advertisement \
-		--disable-man \
-		--disable-qqwry \
-		--disable-updateinfo \
-		--disable-htmlparse \
-		--disable-xdxfparse \
-		--disable-wordnet \
-		--disable-powerwordparse \
-		--disable-wikiparse \
-		--disable-schemas-install \
-		--disable-deprecations \
-		--disable-gnome-support \
-		--enable-nanonote-support \
-	)
-endef
+CONFIGURE_ARGS += \
+	--disable-dependency-tracking \
+	--disable-libtool-lock \
+	--disable-spell \
+	--disable-gucharmap \
+	--disable-festival \
+	--disable-espeak \
+	--disable-dictdotcn \
+	--disable-advertisement \
+	--disable-man \
+	--disable-qqwry \
+	--disable-updateinfo \
+	--disable-htmlparse \
+	--disable-xdxfparse \
+	--disable-wordnet \
+	--disable-powerwordparse \
+	--disable-wikiparse \
+	--disable-schemas-install \
+	--disable-deprecations \
+	--disable-gnome-support \
+	--enable-nanonote-support
 
 define Package/stardict/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/share
-	$(INSTALL_DIR) $(1)/usr/share/pixmaps
+	$(INSTALL_DIR) \
+		$(1)/usr/bin \
+		$(1)/usr/share \
+		$(1)/usr/share/icons
 
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stardict $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/pixmaps/stardict.png $(1)/usr/share/pixmaps/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/stardict $(1)/usr/share/
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/stardict \
+		$(1)/usr/bin/
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/pixmaps/stardict.png \
+		$(1)/usr/share/icons/
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/share/stardict \
+		$(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,stardict))