@@ -259,7 +259,7 @@ tags: $(src_all)
259 LC_ALL=C sort tags >tags.sorted; mv tags.sorted tags
259 LC_ALL=C sort tags >tags.sorted; mv tags.sorted tags
261.PHONY: tarball
261.PHONY: tarball
262−fullname:=$(NAME)-$(VERSION)
262+fullname:=$(THIS)-$(VERSION)
263tarball_name:=$(fullname).tar.gz
263tarball_name:=$(fullname).tar.gz
264cleanup_files+=$(tarball_name)
264cleanup_files+=$(tarball_name)
265tarball: $(tarball_name)
265tarball: $(tarball_name)
@@ -268,49 +268,59 @@ $(tarball_name):
268 tar cvzf $(tarball_name) $(fullname)
268 tar cvzf $(tarball_name) $(fullname)
269 -rm -rf $(fullname)
269 -rm -rf $(fullname)
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 '()')
275+deb_main:=$(deb_name)_$(deb_version)_$(deb_arch).deb
277+ @[ -x /usr/bin/fakeroot ] || { \
278+ echo "*** Please install fakeroot package. ***"; \
281+ @[ -x /usr/bin/dpkg-buildpackage ] || { \
282+ echo "*** Please install dpkg-dev package. ***"; \
285+ if [ -x /usr/bin/debuild ]; then \
286+ debuild -uc -us -i.svn -I.svn -i_darcs -I_darcs --lintian-opts -i; \
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; \
271.PHONY: website
293.PHONY: website
272web_src:=web
294web_src:=web
273web_dest:=web/pandoc
295web_dest:=web/pandoc
274−make_page := $(MAIN) -s -B $(web_src)/header.html -A $(web_src)/footer.html \
296+make_page:=./$(MAIN) -s -B $(web_src)/header.html \
297+ -A $(web_src)/footer.html \
275− -H $(web_src)/css
298+ -H $(web_src)/css
276cleanup_files+=$(web_dest)
299cleanup_files+=$(web_dest)
277website: $(web_dest)
300website: $(web_dest)
279−$(web_dest)/: $(MAIN) html/ $(tarball_name)
301+$(web_dest)/: $(MAIN) html $(tarball_name)
280− [ -f $(osx_dmg_name) ] || { \
302+ @[ -f $(osx_dmg_name) ] || { \
281 echo "*** Missing $(osx_dmg_name). ***"; \
303 echo "*** Missing $(osx_dmg_name). ***"; \
282 exit 1; \
304 exit 1; \
306+ @[ -f ../$(deb_main) ] || { \
307+ echo "*** Missing ../$(deb_main). ***"; \
284 -rm -rf $(web_dest)
310 -rm -rf $(web_dest)
285 mkdir $(web_dest)
311 mkdir $(web_dest)
286 cp -r html $(web_dest)/doc
312 cp -r html $(web_dest)/doc
287 cp $(osx_dmg_name) $(web_dest)/
313 cp $(osx_dmg_name) $(web_dest)/
314+ cp ../$(deb_main) $(web_dest)/
288 cp $(tarball_name) $(web_dest)/
315 cp $(tarball_name) $(web_dest)/
289 cp $(web_src)/*.css $(web_dest)/
316 cp $(web_src)/*.css $(web_dest)/
290 $(make_page) README > $(web_dest)/README.html
317 $(make_page) README > $(web_dest)/README.html
291 $(make_page) INSTALL > $(web_dest)/INSTALL.html
318 $(make_page) INSTALL > $(web_dest)/INSTALL.html
292 $(make_page) changelog > $(web_dest)/history.html
319 $(make_page) changelog > $(web_dest)/history.html
293 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
320 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' | \
295 $(make_page) > $(web_dest)/index.html
322 $(make_page) > $(web_dest)/index.html
298− [ -x /usr/bin/fakeroot ] || { \
299− echo "*** Please install fakeroot package. ***"; \
302− [ -x /usr/bin/dpkg-buildpackage ] || { \
303− echo "*** Please install dpkg-dev package. ***"; \
306− if [ -x /usr/bin/debuild ]; then \
307− debuild -uc -us -i.svn -I.svn -i_darcs -I_darcs --lintian-opts -i; \
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; \
314.PHONY: distclean clean
324.PHONY: distclean clean
315distclean: clean
325distclean: clean
316 if [ -d debian ]; then \
326 if [ -d debian ]; then \