Skip to content

GitLab

L
lyskom-elisp-client
Commit 488b98f4 authored by Joel Rosdahl's avatar Joel Rosdahl
Browse files
Options

Don't remove spec file when cleaning. Include spec file in archive.

parent dbc63433
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
src/Makefile
View file @ 488b98f4
...@@ -170,7 +170,7 @@ TAGS: $(HEADER) $(SOURCES) ...@@ -170,7 +170,7 @@ TAGS: $(HEADER) $(SOURCES)
install: $(TARGET) $(TARGET-EL) install: $(TARGET) $(TARGET-EL)
cp $(TARGET-EL) $(TARGET) $(LISPDIR) cp $(TARGET-EL) $(TARGET) $(LISPDIR)
release: release-files release-move release-cleanup release: release-files release-move
release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC) release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
mkdir lyskom-$(CLIENTVERSION) mkdir lyskom-$(CLIENTVERSION)
...@@ -182,6 +182,7 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC) ...@@ -182,6 +182,7 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
for i in $(DOCFILES) ; do \ for i in $(DOCFILES) ; do \
cp ../doc/$$i lyskom-$(CLIENTVERSION)/$$i ; \ cp ../doc/$$i lyskom-$(CLIENTVERSION)/$$i ; \
done done
sed -e "s/#CLIENTVERSION#/$(CLIENTVERSION)/" -e "s/#REDHATCLIENTVERSION#/$(REDHATCLIENTVERSION)/" <lyskom-elisp-client.spec >lyskom-$(CLIENTVERSION)/lyskom-elisp-client-$(REDHATCLIENTVERSION).spec
( cd lyskom-$(CLIENTVERSION); \ ( cd lyskom-$(CLIENTVERSION); \
autoconf ; \ autoconf ; \
./configure --prefix=$(DEFAULTPREFIX) --with-lispdir=$(DEFAULTLISPDIR) ; \ ./configure --prefix=$(DEFAULTPREFIX) --with-lispdir=$(DEFAULTLISPDIR) ; \
...@@ -191,12 +192,6 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC) ...@@ -191,12 +192,6 @@ release-files: $(HEADER) $(SOURCES) $(DISTSRC) $(MISC)
gzip -9 lyskom-$(CLIENTVERSION).tar gzip -9 lyskom-$(CLIENTVERSION).tar
zip -R9y lyskom-$(CLIENTVERSION).zip 'lyskom-$(CLIENTVERSION)/*' 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: release-move:
if [ ! -z "$(REMOTEDIR)" ] ; then \ if [ ! -z "$(REMOTEDIR)" ] ; then \
scp lyskom-$(CLIENTVERSION).tar.gz $(REMOTEDIR); \ scp lyskom-$(CLIENTVERSION).tar.gz $(REMOTEDIR); \
...@@ -211,7 +206,7 @@ release-move: ...@@ -211,7 +206,7 @@ release-move:
echo "Flyttade inte release-filerna till $(FTPDIR)." ; \ echo "Flyttade inte release-filerna till $(FTPDIR)." ; \
fi fi
debian-package: release-files debian-build release-cleanup debian-package: release-files debian-build
debian-build: release-files debian-build: release-files
cp -R debian lyskom-$(CLIENTVERSION) cp -R debian lyskom-$(CLIENTVERSION)
...@@ -222,7 +217,7 @@ debian-build: release-files ...@@ -222,7 +217,7 @@ debian-build: release-files
cp lyskom-$(CLIENTVERSION).tar.gz lyskom-elisp-client_$(DEBIANCLIENTVERSION).orig.tar.gz cp lyskom-$(CLIENTVERSION).tar.gz lyskom-elisp-client_$(DEBIANCLIENTVERSION).orig.tar.gz
cd lyskom-elisp-client-$(DEBIANCLIENTVERSION) && dpkg-buildpackage 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 redhat-build: release-files
cp lyskom-$(CLIENTVERSION).tar.gz $(RPMROOT)/SOURCES/ cp lyskom-$(CLIENTVERSION).tar.gz $(RPMROOT)/SOURCES/
...@@ -237,4 +232,5 @@ clean: ...@@ -237,4 +232,5 @@ clean:
lyskom-$(CLIENTVERSION).zip \ lyskom-$(CLIENTVERSION).zip \
lyskom-elisp-client-$(DEBIANCLIENTVERSION) lyskom-elisp-client-$(DEBIANCLIENTVERSION)
$(RM) *~ *.elc $(GENERIC-CLEAN) $(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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment