Uniformize package Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@640 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 46 insertions, 33 deletions

diff --git a/openwrt/package/ncurses/Makefile b/openwrt/package/ncurses/Makefile
index a3af81066..b15152634 100644
--- a/openwrt/package/ncurses/Makefile
+++ b/openwrt/package/ncurses/Makefile
@@ -7,46 +7,58 @@ PKG_VERSION:=5.2
 PKG_RELEASE:=6
 PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
 
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \
+PKG_SOURCE_URL:=\
+	ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \
 	ftp://gatekeeper.dec.com/pub/GNU/$(PKG_NAME) \
         ftp://ftp.uu.net/archive/systems/gnu/$(PKG_NAME) \
         ftp://ftp.eu.uu.net/pub/gnu/$(PKG_NAME) \
         ftp://ftp.funet.fi/pub/gnu/prep/$(PKG_NAME) \
         ftp://ftp.leo.org/pub/comp/os/unix/gnu/$(PKG_NAME) \
-        ftp://ftp.digex.net/pub/gnu/$(PKG_NAME) 
-
+        ftp://ftp.digex.net/pub/gnu/$(PKG_NAME) \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+IPKG_LIBNCURSES:=$(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_LIBNCURSES:=$(PKG_BUILD_DIR)/ipkg/lib$(PKG_NAME)
+INFO_LIBNCURSES:=$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
 
 $(DL_DIR)/$(PKG_SOURCE):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
+	touch $(PKG_BUILD_DIR)/.prepared
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		ac_cv_linux_vers="2" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
 		--datadir=/usr/share \
+		--includedir=/usr/include \
+		--infodir=/usr/share/info \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--mandir=/usr/share/man \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
 		--with-terminfo-dirs=/usr/share/terminfo \
 		--with-default-terminfo-dir=/usr/share/terminfo \
 		--without-ada \
@@ -61,8 +73,6 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
 		--enable-overwrite \
 		--with-shared \
 		--with-normal \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
@@ -78,33 +88,36 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		install
 	touch $(PKG_BUILD_DIR)/.built
 	
-$(STAGING_DIR)/usr/include/ncurses.h: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(STAGING_DIR)" \
 		install
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/.built
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libncurses.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/lib
-	cp -a $(PKG_BUILD_DIR)/lib/lib*.so.* $(PKG_IPK_DIR)/usr/lib/
-	mkdir -p $(PKG_IPK_DIR)/usr/share/terminfo
+$(IPKG_LIBNCURSES): $(STAGING_DIR)/usr/lib/libncurses.so
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNCURSES) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(IDIR_LIBNCURSES)/usr/lib
+	cp -fp $(STAGING_DIR)/usr/lib/lib{ncurses,panel}*.so.* $(IDIR_LIBNCURSES)/usr/lib/
+	$(STRIP) $(IDIR_LIBNCURSES)/usr/lib/*.so*
+	mkdir -p $(IDIR_LIBNCURSES)/usr/share/terminfo
 	for f in a/ansi d/dumb l/linux s/screen v/vt100 x/xterm x/xterm-color; do \
-		mkdir -p $(PKG_IPK_DIR)/usr/share/terminfo/`dirname $${f}`; \
+		mkdir -p $(IDIR_LIBNCURSES)/usr/share/terminfo/`dirname $${f}`; \
 		cp -fpR \
 			$(PKG_BUILD_DIR)/install/usr/share/terminfo/$${f} \
-			$(PKG_IPK_DIR)/usr/share/terminfo/$${f}; \
+			$(IDIR_LIBNCURSES)/usr/share/terminfo/$${f}; \
 	done
 	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(IDIR_LIBNCURSES) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(INFO_LIBNCURSES): $(IPKG_LIBNCURSES)
+	$(IPKG) install $(IPKG_LIBNCURSES)
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(STAGING_DIR)/usr/include/ncurses.h $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_LIBNCURSES)
+install: $(INFO_LIBNCURSES)
 
 clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+	-$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(STAGING_DIR)" \
+		uninstall
+	rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBNCURSES)