Use new Makefile target for Debian package build.

src/ChangeLog

+2000-08-29  Joel Rosdahl  <joel@lysator.liu.se>
+
+	* Makefile (debian-build): Use new Makefile target.
+
+	* debian/rules (binary-indep): Use new Makefile target.
+
 2000-08-29  David Byers  <davby@sen2.ida.liu.se>
 
 	* Release av 0.46-BETA-P

src/Makefile

@@ -198,7 +198,8 @@ debian-package: release-files debian-build release-cleanup
 debian-build: release-files
 	cp -R debian lyskom-$(CLIENTVERSION)
 	$(RM) -rf lyskom-$(CLIENTVERSION)/debian/CVS
-	perl -pi -e 's/\((.+)\)/($(DEBIANCLIENTVERSION)-1)/ if (1..1)' lyskom-$(CLIENTVERSION)/debian/changelog
+	sed '1s/(.*)/($(DEBIANCLIENTVERSION))/' <debian/changelog >lyskom-$(CLIENTVERSION)/debian/changelog
+	sed 's/@@CLIENTVERSION@@/$(CLIENTVERSION)/g' <debian/rules >lyskom-$(CLIENTVERSION)/debian/rules
 	mv lyskom-$(CLIENTVERSION) lyskom-elisp-client-$(DEBIANCLIENTVERSION)
 	cp lyskom-$(CLIENTVERSION).tar.gz lyskom-elisp-client_$(DEBIANCLIENTVERSION).orig.tar.gz
 	cd lyskom-elisp-client-$(DEBIANCLIENTVERSION) && dpkg-buildpackage
@@ -209,6 +210,7 @@ redhat-build: release-files
 	cp lyskom-$(CLIENTVERSION).tar.gz $(RPMROOT)/SOURCES/
 	sed -e "s/#CLIENTVERSION#/$(CLIENTVERSION)/" -e "s/#REDHATCLIENTVERSION#/$(REDHATCLIENTVERSION)/" <lyskom-elisp-client.spec >$(RPMROOT)/SPECS/lyskom-elisp-client-$(REDHATCLIENTVERSION).spec
 	rpm -ba $(RPMROOT)/SPECS/lyskom-elisp-client-$(REDHATCLIENTVERSION).spec
+
 clean:
 	$(RM) *.el.gz *.elc.gz $(TARGET-EL)
 	$(RM) -rf lyskom-$(CLIENTVERSION) \

src/debian/rules

@@ -26,9 +26,9 @@ binary-indep: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) lyskom.el
+	$(MAKE) lyskom-@@CLIENTVERSION@@.el
 	cp lpath.el debian/tmp/usr/share/emacs/site-lisp/lyskom-elisp-client/
-	gzip -c lyskom.el > debian/tmp/usr/share/emacs/site-lisp/lyskom-elisp-client/lyskom.el.gz
+	gzip -c lyskom-@@CLIENTVERSION@@.el > debian/tmp/usr/share/emacs/site-lisp/lyskom-elisp-client/lyskom.el.gz
 
 	install -m 644 debian/50lyskom-elisp-client.el debian/tmp/etc/emacs/site-start.d
 	install -m 755 debian/emacsen-common-install debian/tmp/usr/lib/emacsen-common/packages/install/lyskom-elisp-client