From 488b98f45459448e2552c8edd76788d7f479d5db Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 25 Feb 2001 16:26:36 +0000
Subject: [PATCH] Don't remove spec file when cleaning. Include spec file in
 archive.

---
 src/Makefile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9663791a..3d4b5b9c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -170,7 +170,7 @@ TAGS: $(HEADER) $(SOURCES)
 install: $(TARGET) $(TARGET-EL)
 	cp $(TARGET-EL) $(TARGET) $(LISPDIR)
 
-release: release-files release-move release-cleanup
+release: release-files release-move
 
 release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
 	mkdir lyskom-$(CLIENTVERSION)
@@ -182,6 +182,7 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
 	for i in $(DOCFILES) ; do \
 		cp ../doc/$$i lyskom-$(CLIENTVERSION)/$$i ; \
 	done
+	sed -e "s/#CLIENTVERSION#/$(CLIENTVERSION)/" -e "s/#REDHATCLIENTVERSION#/$(REDHATCLIENTVERSION)/" <lyskom-elisp-client.spec >lyskom-$(CLIENTVERSION)/lyskom-elisp-client-$(REDHATCLIENTVERSION).spec
 	( cd lyskom-$(CLIENTVERSION); \
 	autoconf ; \
 	./configure --prefix=$(DEFAULTPREFIX) --with-lispdir=$(DEFAULTLISPDIR) ; \
@@ -191,12 +192,6 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
 	gzip -9 lyskom-$(CLIENTVERSION).tar
 	zip -R9y lyskom-$(CLIENTVERSION).zip 'lyskom-$(CLIENTVERSION)/*'
 
-release-cleanup:
-	$(RM) -rf lyskom-$(CLIENTVERSION) \
-		  lyskom-$(CLIENTVERSION).tar.gz \
-		  lyskom-$(CLIENTVERSION).zip \
-		  lyskom-elisp-client-$(DEBIANCLIENTVERSION)
-
 release-move: 
 	if [ ! -z "$(REMOTEDIR)" ] ; then \
 	    scp lyskom-$(CLIENTVERSION).tar.gz $(REMOTEDIR); \
@@ -211,7 +206,7 @@ release-move:
 		echo "Flyttade inte release-filerna till $(FTPDIR)." ; \
 	fi
 
-debian-package: release-files debian-build release-cleanup
+debian-package: release-files debian-build
 
 debian-build: release-files
 	cp -R debian lyskom-$(CLIENTVERSION)
@@ -222,7 +217,7 @@ debian-build: release-files
 	cp lyskom-$(CLIENTVERSION).tar.gz lyskom-elisp-client_$(DEBIANCLIENTVERSION).orig.tar.gz
 	cd lyskom-elisp-client-$(DEBIANCLIENTVERSION) && dpkg-buildpackage
 
-redhat-packages: release-files redhat-build release-cleanup
+redhat-packages: release-files redhat-build
 
 redhat-build: release-files
 	cp lyskom-$(CLIENTVERSION).tar.gz $(RPMROOT)/SOURCES/
@@ -237,4 +232,5 @@ clean:
 		  lyskom-$(CLIENTVERSION).zip \
 		  lyskom-elisp-client-$(DEBIANCLIENTVERSION)
 	$(RM) *~ *.elc $(GENERIC-CLEAN)
-	$(RM) -r build-stamp lyskom-elisp-client*
+	$(RM) -r build-stamp lyskom-elisp-client*.gz lyskom-elisp-client*.deb \
+		lyskom-elisp-client*.dsc lyskom-elisp-client*.changes
-- 
GitLab