X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c9467b7a34160c4e25580a2dc82087c5ae0bb2d0..9c15449d763c5e9449f306ae0c320b39375afc98:/debian/rules

diff --git a/debian/rules b/debian/rules
index 620c775..d539af7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,17 +20,15 @@ cgiexecdir=/usr/lib/cgi-bin
 httpdir=/var/www
 browser=x-www-browser
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+
 # Options to configure.  This can be overridden by the caller if necessary.
 CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
 
-# Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -g
-else
-CFLAGS=-O2 -g
-endif
-export CFLAGS
-
 # Install commands.  You wouldn't normally override these.
 INSTALL=install
 INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
@@ -62,20 +60,14 @@ FAKEROOT=fakeroot
 
 SHELL=bash
 
-# ./prepare is the script that generates configure etc.  It only needs to be
+# ./autogen.sh is the script that generates configure etc.  It only needs to be
 # run if building from a checkout rather than a tarball.
 build:
 	@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\
-	  echo ./config.status;\
-	  ./config.status;\
+	  echo ./autogen.sh;\
+	  ./autogen.sh;\
 	fi
+	./configure ${CONFIGURE} ${CONFIGURE_EXTRA}
 	$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
 
 pkg-disorder: build
@@ -123,7 +115,7 @@ pkg-disorder: build
 	dpkg-shlibdeps -Tdebian/substvars.disorder \
 		debian/disorder/usr/bin/*
 	$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
-		BUGS README.* \
+		BUGS README.* docs.css \
 		debian/disorder/usr/share/doc/disorder/.
 	gzip -9f debian/disorder/usr/share/doc/disorder/README \
 		 debian/disorder/usr/share/doc/disorder/README.* \
@@ -166,7 +158,6 @@ pkg-disorder-server: build
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C images
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C server
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C templates
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C driver
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C plugins
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C sounds
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C doc
@@ -181,16 +172,13 @@ pkg-disorder-server: build
 	  echo mv $$f $${f/.0.0.0};\
 	  mv $$f $${f/.0.0.0};\
 	done
-	@for f in debian/disorder-server/usr/lib/ao/plugins*/*.so.0.0.0; do \
-	  echo mv $$f $${f/.0.0.0};\
-	  mv $$f $${f/.0.0.0};\
-	done
 	find debian/disorder-server -name '*.so' -print0 | xargs -r0 strip --strip-unneeded
 	find debian/disorder-server -name '*.so' -print0 | xargs -r0 chmod -x
 	$(MKDIR) debian/disorder-server/etc/disorder
 	$(MKDIR) debian/disorder-server/etc/init.d
 	$(MKDIR) debian/disorder-server${cgiexecdir}
 	$(MKDIR) debian/disorder-server/var/lib/disorder
+	$(MKDIR) debian/disorder-server/etc/cron.daily
 	$(INSTALL_SCRIPT) examples/disorder.init \
 		debian/disorder-server/etc/init.d/disorder
 	$(INSTALL_DATA) debian/etc.disorder.config \
@@ -199,6 +187,7 @@ pkg-disorder-server: build
 		debian/disorder-server/etc/disorder/options
 	$(INSTALL_DATA) debian/etc.disorder.options.user \
 		debian/disorder-server/etc/disorder/options.user
+	$(INSTALL_SCRIPT) debian/disorder.daily debian/disorder-server/etc/cron.daily/disorder
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
 		$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
 	gzip -9f debian/disorder-server/usr/share/man/man*/*
@@ -211,7 +200,6 @@ pkg-disorder-server: build
 	strip --remove-section=.comment \
 		debian/disorder-server/usr/sbin/* \
 		debian/disorder-server${cgiexecdir}/* \
-		debian/disorder-server/usr/lib/ao/plugins*/*.so \
 		debian/disorder-server/usr/lib/disorder/*.so
 	cd debian/disorder-server && \
 		find -name DEBIAN -prune -o -type f -print \
@@ -280,6 +268,7 @@ pkg-disobedience: build
 	$(MKDIR) debian/disobedience/usr/share/man/man1
 	$(MKDIR) debian/disobedience/usr/share/pixmaps
 	$(MKDIR) debian/disobedience/usr/share/menu
+	$(MKDIR) debian/disobedience/usr/share/doc-base
 	$(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
 	strip --remove-section=.comment debian/disobedience/usr/bin/disobedience
 	$(INSTALL_DATA) doc/disobedience.1 \
@@ -289,6 +278,8 @@ pkg-disobedience: build
 			debian/disobedience/usr/share/pixmaps
 	$(INSTALL_DATA) debian/usr.share.menu.disobedience \
 		debian/disobedience/usr/share/menu/disobedience
+	$(INSTALL_DATA) debian/disobedience-manual \
+		debian/disobedience/usr/share/doc-base/disobedience-manual
 	gzip -9f debian/disobedience/usr/share/man/man*/*
 	dpkg-shlibdeps -Tdebian/substvars.disobedience \
 		debian/disobedience/usr/bin/*
@@ -326,7 +317,7 @@ binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
 binary-indep: 
 
 clean:
-	test -f Makefile && $(MAKE) distclean
+	if test -f Makefile; then $(MAKE) distclean; fi
 	rm -f config.cache
 	rm -f debian/files
 	rm -f debian/substvars.*