Gerard "Lledó\" <[EMAIL PROTECTED]> writes:
> The problem is that debian/rules is overwriting the main Makefile in the
> first build with the Makefile that is contained in
> fhs-2.3-source.tar.gz. Probably, this file was supossed to uncompress in
> a directory, but it's not doing that. Of course, the second time that
> you try to build, the Makefile is the wrong one.
> I've done a patch, but it's just one line, so feel free to send it to
> /dev/null
> --- debian-policy-3.7.2.2/debian/rules 2006-10-03 01:36:50.000000000
> +0300
> +++ debian-policy-3.7.2.3/debian/rules 2007-06-29 14:07:49.000000000
> +0300
> @@ -90,7 +90,7 @@
> $(SGML_FILES:=.html.tar.gz) \
> $(SGML_FILES:=.txt.gz) \
> policy.ps.gz policy.pdf.gz
> - tar -zxf $(FHS_ARCHIVE)
> + mkdir fhs && cd fhs && tar -zxf ../$(FHS_ARCHIVE) && cd ..
> # Need to use a patched tmac.m macro file if we're using a pre-1.16
> # groff; version 1.16 is apparently fixed
> if dpkg --compare-versions "$(shell dpkg -s groff | sed -n -e
> 's/Version: //p')" lt 1.16; then \
Looking at debian/rules, I'm fairly sure that there's no point in
unpacking the archive since we don't ever use the contents. We ship the
pre-built output files.
We were also installing the FHS files twice, which doesn't look necessary.
Manoj, could you double-check this patch? I think it's all that's needed
to fix this.
--- orig/debian/rules
+++ mod/debian/rules
@@ -90,7 +90,6 @@
$(SGML_FILES:=.html.tar.gz) \
$(SGML_FILES:=.txt.gz) \
policy.ps.gz policy.pdf.gz
- tar -zxf $(FHS_ARCHIVE)
# Need to use a patched tmac.m macro file if we're using a pre-1.16
# groff; version 1.16 is apparently fixed
if dpkg --compare-versions "$(shell dpkg -s groff | sed -n -e
's/Version: //p')" lt 1.16; then \
@@ -148,7 +147,6 @@
echo "debian-policy:Version=$(version)" > debian/substvars
$(install_file) $(POLICY_FILES) $(DOCDIR)/
# $(install_file) $(FSSTND_FILES) $(DOCDIR)/fsstnd/
- $(install_file) $(FHS_FILES) $(DOCDIR)/fhs/
$(install_file) debian/changelog $(DOCDIR)/
# Be more specific with file compression
gzip -f9 $(DOCDIR)/*.txt $(DOCDIR)/*.sgml \
--
Russ Allbery ([EMAIL PROTECTED]) <http://www.eyrie.org/~eagle/>
