X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..eb5f83f45eb2ff415ededbb30187fec8c3e71010:/debian/rules diff --git a/debian/rules b/debian/rules index 9eb4d19..ce385d7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #! /usr/bin/make -f # -# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -48,14 +48,14 @@ export INSTALL_PROGRAM LIBTOOL=./libtool FAKEROOT=fakeroot -.PHONY: build # ./prepare is the script that generates configure etc. It only needs to be # run if building from a checkout rather than a tarball. build: - @if test ! -f configure; then \ - echo ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\ - ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\ - elif test ! -f config.status; then \ + @set -e;if test ! -f configure; then \ + echo ./prepare;\ + ./prepare;\ + fi + @set -e;if test ! -f config.status; then \ echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\ ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\ else\ @@ -64,11 +64,6 @@ build: fi $(MAKE) -.PHONY: cleanpkg-disorder -cleanpkg-disorder: - rm -rf debian/disorder - -.PHONY: pkg-disorder pkg-disorder: build rm -rf debian/disorder $(MKDIR) debian/disorder @@ -104,9 +99,7 @@ pkg-disorder: build $(INSTALL_DATA) CHANGES README debian/README.Debian \ BUGS README.* \ debian/disorder/usr/share/doc/disorder/. - bzr log > debian/disorder/usr/share/doc/disorder/changelog - gzip -9f debian/disorder/usr/share/doc/disorder/changelog \ - debian/disorder/usr/share/doc/disorder/CHANGES \ + gzip -9f debian/disorder/usr/share/doc/disorder/CHANGES \ debian/disorder/usr/share/doc/disorder/README \ debian/disorder/usr/share/doc/disorder/README.* \ debian/disorder/usr/share/doc/disorder/BUGS \ @@ -116,12 +109,6 @@ pkg-disorder: build chmod -R g-ws debian/disorder dpkg --build debian/disorder .. - -.PHONY: cleanpkg-disorder-server -cleanpkg-disorder-server: - rm -rf debian/disorder-server - -.PHONY: pkg-disorder-server pkg-disorder-server: build rm -rf debian/disorder-server $(MKDIR) debian/disorder-server @@ -150,22 +137,22 @@ pkg-disorder-server: build rm -rf debian/disorder-server/usr/share/man/man5 $(MKDIR) debian/disorder-server/etc/disorder $(MKDIR) debian/disorder-server/etc/init.d - $(MKDIR) debian/disorder-server/usr/lib/cgi-bin/disorder + $(MKDIR) debian/disorder-server/usr/lib/cgi-bin $(MKDIR) debian/disorder-server/var/lib/disorder $(INSTALL_SCRIPT) examples/disorder.init \ debian/disorder-server/etc/init.d/disorder $(INSTALL_DATA) debian/etc.disorder.config \ debian/disorder-server/etc/disorder/config - $(INSTALL_DATA) debian/etc.disorder.options \ + $(INSTALL_DATA) templates/options \ debian/disorder-server/etc/disorder/options + $(INSTALL_DATA) debian/etc.disorder.options.user \ + debian/disorder-server/etc/disorder/options.user $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \ - $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder/disorder + $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder dpkg-shlibdeps -Tdebian/substvars.disorder-server \ - debian/disorder-server/usr/lib/cgi-bin/disorder/* \ + debian/disorder-server/usr/lib/cgi-bin/disorder \ debian/disorder-server/usr/sbin/* \ debian/disorder-server/usr/lib/disorder/*.so* - $(INSTALL_DATA) debian/htaccess \ - debian/disorder-server/usr/lib/cgi-bin/disorder/.htaccess rm -rf debian/disorder-server/usr/share/doc/disorder-server ln -s disorder debian/disorder-server/usr/share/doc/disorder-server dpkg-gencontrol -isp -pdisorder-server -Pdebian/disorder-server -Tdebian/substvars.disorder-server @@ -173,12 +160,6 @@ pkg-disorder-server: build chmod -R g-ws debian/disorder-server dpkg --build debian/disorder-server .. - -.PHONY: cleanpkg-disorder-playrtp -cleanpkg-disorder-playrtp: - rm -rf debian/disorder-playrtp - -.PHONY: pkg-disorder-playrtp pkg-disorder-playrtp: build rm -rf debian/disorder-playrtp $(MKDIR) debian/disorder-playrtp @@ -213,12 +194,6 @@ pkg-disorder-playrtp: build chmod -R g-ws debian/disorder-playrtp dpkg --build debian/disorder-playrtp .. - -.PHONY: cleanpkg-disobedience -cleanpkg-disobedience: - rm -rf debian/disobedience - -.PHONY: pkg-disobedience pkg-disobedience: build rm -rf debian/disobedience $(MKDIR) debian/disobedience @@ -256,7 +231,6 @@ pkg-disobedience: build chmod -R g-ws debian/disobedience dpkg --build debian/disobedience .. - DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}') DSC=disorder_$(DEBVERSION).dsc DEBSRC=disorder_$(DEBVERSION).tar.gz @@ -274,16 +248,20 @@ source-check: source dpkg-source -x $(DSC) cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT) -.PHONY: source source-check - -.PHONY: binary binary-arch binary-indep binary: binary-arch binary-indep -binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp pkg-disobedience +binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \ + pkg-disobedience binary-indep: -.PHONY: clean -clean: cleanpkg-disorder cleanpkg-disorder-server cleanpkg-disorder-playrtp cleanpkg-disobedience +clean: -$(MAKE) distclean rm -f config.cache rm -f debian/files rm -f debian/substvars.* + rm -rf debian/disorder + rm -rf debian/disorder-server + rm -rf debian/disorder-playrtp + rm -rf debian/disobedience + +.PHONY: clean build pkg-disorder pkg-disorder-server pkg-disorder-playrtp \ + pkg-disobedience source source-check binary binary-arch binary-indep