Uniformize package Makefile

SVN-Revision: 645

openwrt/package/strace/Makefile

@@ -9,60 +9,69 @@ PKG_MD5SUM:=28335e15c83456a3db055a0a0efcb4fe
 
 PKG_SOURCE_URL:=@SF/strace
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=bzcat
-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_STRACE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_STRACE:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
+INFO_STRACE:=$(IPKG_STATE_DIR)/info/$(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
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		./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 \
+		--mandir=/usr/share/man \
-		--infodir=/usr/info \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc \
 		$(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC)
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
+$(IPKG_STRACE): $(PKG_BUILD_DIR)/$(PKG_NAME)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_STRACE) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
+	mkdir -p $(IDIR_STRACE)/usr/sbin
-	cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/
+	cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_STRACE)/usr/sbin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	$(STRIP) $(IDIR_STRACE)/usr/sbin/*
 	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(IDIR_STRACE) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
+$(INFO_STRACE): $(IPKG_STRACE)
-	$(IPKG) install $(PKG_IPK)
+	$(IPKG) install $(IPKG_STRACE)
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
+prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(PKG_IPK)
+compile: $(IPKG_STRACE)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+install: $(INFO_STRACE)
 
 clean:
-	rm -rf $(PKG_BUILD_DIR)
+	rm -rf $(PKG_BUILD_DIR) $(IPKG_STRACE)
-	rm -f $(PKG_IPK)