From 8996452e12c4b58d074334ade1deddcf3836b98c Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Thu, 17 Jul 2008 11:58:50 -0400
Subject: Minor Makefile fixes

---
 genome-bridge/Makefile  | 9 ++-------
 genome-release/Makefile | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/genome-bridge/Makefile b/genome-bridge/Makefile
index cabf32f..c25cfdb 100644
--- a/genome-bridge/Makefile
+++ b/genome-bridge/Makefile
@@ -10,7 +10,6 @@ CVS             = cvs
 RPMBUILD	= rpmbuild
 INSTALL         = /usr/bin/install
 INSTALL_DIR     = $(INSTALL) --verbose -d -m 755
-ARCHIVE         = $(NAME)-$(VERSION).tar.gz	
 
 RPM_TOPDIR	= /tmp/$(NAME)-$(VERSION)-$(RELEASE)-build
 _RPM_OPTS	= --define "_topdir	    $(RPM_TOPDIR)" \
@@ -22,15 +21,11 @@ _RPM_OPTS	= --define "_topdir	    $(RPM_TOPDIR)" \
 		  --define '_rpmfilename    %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
 RPM_OPTS        = $(strip $(_RPM_OPTS))
 
-rpm: clean $(RPM_TOPDIR) $(SPECFILE) $(ARCHIVE)
+rpm: clean $(RPM_TOPDIR) $(SPECFILE)
 	$(RPMBUILD) $(RPM_OPTS) -bs $(SPECFILE)
-	rm -f $(ARCHIVE)
 
 clean:
-	@rm -rfv *~ *.rpm $(RPM_TOPDIR) $(ARCHIVE)
-
-$(ARCHIVE):
-	cd $(NAME)-$(VERSION); tar cvzf ../$(ARCHIVE) ./*; cd ..
+	@rm -rfv *~ *.rpm $(RPM_TOPDIR)
 
 $(RPM_TOPDIR):
 	@$(INSTALL_DIR) $@
diff --git a/genome-release/Makefile b/genome-release/Makefile
index 07ac6d1..1e5a9e9 100644
--- a/genome-release/Makefile
+++ b/genome-release/Makefile
@@ -10,7 +10,6 @@ CVS             = cvs
 RPMBUILD	= rpmbuild
 INSTALL         = /usr/bin/install
 INSTALL_DIR     = $(INSTALL) --verbose -d -m 755
-ARCHIVE         = $(NAME)-$(VERSION).tar.gz	
 
 RPM_TOPDIR	= /tmp/$(NAME)-$(VERSION)-$(RELEASE)-build
 _RPM_OPTS	= --define "_topdir	    $(RPM_TOPDIR)" \
@@ -22,15 +21,11 @@ _RPM_OPTS	= --define "_topdir	    $(RPM_TOPDIR)" \
 		  --define '_rpmfilename    %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
 RPM_OPTS        = $(strip $(_RPM_OPTS))
 
-rpm: clean $(RPM_TOPDIR) $(SPECFILE) $(ARCHIVE)
+rpm: clean $(RPM_TOPDIR) $(SPECFILE)
 	$(RPMBUILD) $(RPM_OPTS) -bs $(SPECFILE)
-	rm -f $(ARCHIVE)
 
 clean:
-	@rm -rfv *~ *.rpm $(RPM_TOPDIR) $(ARCHIVE)
-
-$(ARCHIVE):
-	cd $(NAME)-$(VERSION); tar cvzf ../$(ARCHIVE) ./*; cd ..
+	@rm -rfv *~ *.rpm $(RPM_TOPDIR)
 
 $(RPM_TOPDIR):
 	@$(INSTALL_DIR) $@
-- 
cgit