X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 10190DC0186 for ; Wed, 17 Jul 2013 14:09:38 +0000 (UTC) Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 49C4920F50 for ; Wed, 17 Jul 2013 10:09:36 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 Jul 2013 10:09:37 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=qVN6lLJrrJhlJ00B9kqn7nwTm qk=; b=mcDfOtl3xa5+jWj2OuxZmLp/UN/1K69PAl83rH0ZdB91SLilzsmtPCczx 9CvsKJRYFDd2p2L0vrYA3iacJ9F8wOJ0y/o1kUgzY9g1fY08Y4KgCSjVp2g1+iNN H7dpnJmlmwfhFODv0Th1sQ179dV6jPXcynqMqg8bKezZhImbCM= X-Sasl-enc: gWSyUoebKenahECFrgv3v7Mfcx7pGTpfjz8rU3G+lovI 1374070175 Received: from localhost (unknown [69.86.161.244]) by mail.messagingengine.com (Postfix) with ESMTPA id EA40B6800BB for ; Wed, 17 Jul 2013 10:09:35 -0400 (EDT) From: Dubiousjim To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH 1/2] Makefile: remove dist target and associated vars Date: Wed, 17 Jul 2013 10:09:34 -0400 Message-Id: <28eddac1295abd38c2ac5671b78f6218021dd32f.1374070138.git.dubiousjim@gmail.com> X-Mailer: git-send-email 1.8.3.3 In-Reply-To: <20130708150956.6750ab71@ncopa-desktop.alpinelinux.org> References: <20130708150956.6750ab71@ncopa-desktop.alpinelinux.org> X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- Makefile | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 59d4e0a..aff475a 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,7 @@ VERSION := 2.13.0 sysconfdir ?= /etc/lbu -P := alpine-conf -PV := $(P)-$(VERSION) -TARBZ2 := $(PV).tar.bz2 PREFIX ?= -TMP := $(PV) LIB_FILES := libalpine.sh SBIN_FILES := lbu\ @@ -34,12 +30,8 @@ SBIN_FILES := lbu\ BIN_FILES := uniso SCRIPTS := $(LIB_FILES) $(SBIN_FILES) -SCRIPT_SOURCES := $(addsuffix .in,$(SCRIPTS)) - ETC_LBU_FILES := lbu.conf -EXTRA_DIST := Makefile README -DIST_FILES := $(SCRIPT_SOURCES) $(ETC_LBU_FILES) $(EXTRA_DIST) GIT_REV := $(shell test -d .git && git describe || echo exported) ifneq ($(GIT_REV), exported) @@ -55,7 +47,6 @@ WWW="http://alpinelinux.org/alpine-conf" SED := sed -TAR := tar SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \ -e 's:@PREFIX@:$(PREFIX):g' \ @@ -68,23 +59,13 @@ SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \ .in: ${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@ -.PHONY: all apk clean dist install uninstall +.PHONY: all apk clean install uninstall all: $(SCRIPTS) $(BIN_FILES) uniso: uniso.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ apk: $(APKF) - -dist: $(TARBZ2) - - -$(TARBZ2): $(DIST_FILES) - rm -rf $(TMP) - mkdir -p $(TMP) - cp $(DIST_FILES) $(TMP) - $(TAR) -cjf $@ $(TMP) - rm -rf $(TMP) install: $(BIN_FILES) $(SBIN_FILES) $(LIB_FILES) $(ETC_LBU_FILES) install -m 755 -d $(DESTDIR)/$(PREFIX)/bin @@ -105,5 +86,5 @@ uninstall: done clean: - rm -rf $(SCRIPTS) $(BIN_FILES) $(TMP) $(TARBZ2) + rm -rf $(SCRIPTS) $(BIN_FILES) -- 1.8.3.3 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---