X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Frules;h=d3133766954d8f69aa7cebe02b4fec1d2118e56a;hb=3ea4c680c86976f7377245116a61d162f819b11e;hp=6d1d1eeb8965bafd1c9cdc947a8394995fd8d4e4;hpb=063043345ff03756854d847e2f0c8e3d376cabb6;p=developers-reference.git

diff --git a/debian/rules b/debian/rules
index 6d1d1ee..d313376 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,13 +33,14 @@ source-depends:
 	@set -e								;\
 	for dep in $(SRC_DEPENDS); do					\
 	    echo "checking if package \`$$dep' is installed..."		;\
-	    dpkg --get-selections | grep "$$dep[[:space:]]\+install" ||	\
+	    dpkg --get-selections | grep "$$dep\W\+install" ||	\
 		exit 1							;\
 	done
 	@echo "all source-depends seem to be installed, good"
 
-build:	source-depends
+build:	developers-reference.sgml
 	$(checkdir)
+	#./debian/rules source-depends
 	rm -f version.ent
 	echo "<!entity version \"$(DEB_VERSION)\">" >> version.ent
 	echo "<!entity date    \"$(DATE)\">"        >> version.ent
@@ -71,7 +72,7 @@ binary-indep:	build
 	$(make_directory) $(docbasedir)
 
 	$(make_directory) $(docdir)/developers-reference.html
-	$(install_file) developers-reference.html/*	\
+	$(install_file) developers-reference.html/*			\
 		$(docdir)/developers-reference.html/
 	$(install_file) developers-reference.text $(docdir)
 	$(install_file) developers-reference.sgml $(docdir)
@@ -84,13 +85,13 @@ binary-indep:	build
 	sh -n debian/postinst
 	sh -n debian/prerm
 	# install the control files
-	$(install_script) debian/control debian/postinst debian/prerm \
+	$(install_script) debian/control debian/postinst debian/prerm	\
 		$(prefix)/DEBIAN/
 
 	# compress docdir (policy)	
-	find $(docdir) -type f \( -size +4k -or -iname "change*" \) \
-            ! -name "*.html" ! -name "*.gif" \
-            ! -name "copyright" | xargs $(compress)
+	find $(docdir) -type f \( -size +4k -or -iname "change*" \)	\
+		! -name "*.html" ! -name "*.gif"			\
+		! -name "copyright" | xargs $(compress)
 
 	dpkg-gencontrol -isp
 	dpkg --build $(prefix) ..
@@ -100,14 +101,15 @@ binary-indep:	build
 	$(install_file) developers-reference.ps ../
 	$(compress) ../developers-reference.ps
 	dpkg-distaddfile -fdebian/files developers-reference.ps.gz byhand -
-	GZIP=-9v tar czf ../developers-reference.html.tar.gz developers-reference.html
-	dpkg-distaddfile -fdebian/files developers-reference.html.tar.gz byhand -
+	GZIP=-9v tar czf ../developers-reference.html.tar.gz		\
+		developers-reference.html
+	dpkg-distaddfile -fdebian/files developers-reference.html.tar.gz\
+		byhand -
 	$(install_file) developers-reference.text ..
 	$(compress) developers-reference.text
 	dpkg-distaddfile -fdebian/files developers-reference.text.gz byhand -
 
 binary-arch:	build
-	$(checkdir)
 # There are no architecture-dependent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
@@ -116,8 +118,12 @@ define checkdir
 	test -f debian/rules
 endef
 
+define checkroot
+	test `id -u` = 0
+endef
+
 # Below here is fairly generic really
 
 binary:		binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean