@@ -259,7 +259,7 @@ tags: $(src_all)
259259 LC_ALL=C sort tags >tags.sorted; mv tags.sorted tags
260260
261261.PHONY: tarball
262−fullname:=$(NAME)-$(VERSION)
262+fullname:=$(THIS)-$(VERSION)
263263tarball_name:=$(fullname).tar.gz
264264cleanup_files+=$(tarball_name)
265265tarball: $(tarball_name)
@@ -268,49 +268,59 @@ $(tarball_name):
268268 tar cvzf $(tarball_name) $(fullname)
269269 -rm -rf $(fullname)
270270
271+.PHONY: deb
272+deb_name:=$(shell grep ^Package debian/control | cut -d' ' -f2 | head -n 1)
273+deb_version:=$(shell head -n 1 debian/changelog | cut -f2 -d' ' | tr -d '()')
274+deb_arch:=i386
275+deb_main:=$(deb_name)_$(deb_version)_$(deb_arch).deb
276+deb: debian
277+ @[ -x /usr/bin/fakeroot ] || { \
278+ echo "*** Please install fakeroot package. ***"; \
279+ exit 1; \
280+ }
281+ @[ -x /usr/bin/dpkg-buildpackage ] || { \
282+ echo "*** Please install dpkg-dev package. ***"; \
283+ exit 1; \
284+ }
285+ if [ -x /usr/bin/debuild ]; then \
286+ debuild -uc -us -i.svn -I.svn -i_darcs -I_darcs --lintian-opts -i; \
287+ else \
288+ echo "*** Please install devscripts package. ***"; \
289+ echo "*** Using dpkg-buildpackage for package building. ***"; \
290+ dpkg-buildpackage -rfakeroot -uc -us -i.svn -I.svn -i_darcs -I_darcs; \
291+ fi
292+
271293.PHONY: website
272294web_src:=web
273295web_dest:=web/pandoc
274−make_page := $(MAIN) -s -B $(web_src)/header.html -A $(web_src)/footer.html \
275− -H $(web_src)/css
296+make_page:=./$(MAIN) -s -B $(web_src)/header.html \
297+ -A $(web_src)/footer.html \
298+ -H $(web_src)/css
276299cleanup_files+=$(web_dest)
277300website: $(web_dest)
278−
279−$(web_dest)/: $(MAIN) html/ $(tarball_name)
280− [ -f $(osx_dmg_name) ] || { \
301+$(web_dest)/: $(MAIN) html $(tarball_name)
302+ @[ -f $(osx_dmg_name) ] || { \
281303 echo "*** Missing $(osx_dmg_name). ***"; \
282304 exit 1; \
283305 }
306+ @[ -f ../$(deb_main) ] || { \
307+ echo "*** Missing ../$(deb_main). ***"; \
308+ exit 1; \
309+ }
284310 -rm -rf $(web_dest)
285311 mkdir $(web_dest)
286312 cp -r html $(web_dest)/doc
287313 cp $(osx_dmg_name) $(web_dest)/
314+ cp ../$(deb_main) $(web_dest)/
288315 cp $(tarball_name) $(web_dest)/
289316 cp $(web_src)/*.css $(web_dest)/
290317 $(make_page) README > $(web_dest)/README.html
291318 $(make_page) INSTALL > $(web_dest)/INSTALL.html
292319 $(make_page) changelog > $(web_dest)/history.html
293320 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
294− sed -e 's/@DEB_NAME@/$(deb_name)/g' | \
321+ sed -e 's/@DEB_NAME@/$(deb_main)/g' | \
295322 $(make_page) > $(web_dest)/index.html
296323
297−deb: debian
298− [ -x /usr/bin/fakeroot ] || { \
299− echo "*** Please install fakeroot package. ***"; \
300− exit 1; \
301− }
302− [ -x /usr/bin/dpkg-buildpackage ] || { \
303− echo "*** Please install dpkg-dev package. ***"; \
304− exit 1; \
305− }
306− if [ -x /usr/bin/debuild ]; then \
307− debuild -uc -us -i.svn -I.svn -i_darcs -I_darcs --lintian-opts -i; \
308− else \
309− echo "*** Please install devscripts package. ***"; \
310− echo "*** Using dpkg-buildpackage for package building. ***"; \
311− dpkg-buildpackage -rfakeroot -uc -us -i.svn -I.svn -i_darcs -I_darcs; \
312− fi
313−
314324.PHONY: distclean clean
315325distclean: clean
316326 if [ -d debian ]; then \