On Tue, 9 Jun 2009 13:52:49 +0100 Wookey <wookey@wookware.org> wrote: > If someone who understands cdbs agrees this is the right fix then I'll > file it as a bug: (I haven't built the package, just looking over the patch and original debian/rules file from a CDBS perspective.) > --- rules.orig 2009-06-09 11:00:39.000000000 +0100 > +++ rules 2009-06-09 13:49:36.000000000 +0100 > @@ -159,9 +159,9 @@ > binary-post-install/gdb$(TS) :: > if [ -x debian/tmp/usr/bin/run ]; then \ > mv debian/tmp/usr/bin/run \ > - debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \ > + debian/gdb$(TS)/usr/bin/$(TP)run; \ In the section above, TP is defined as: TP=$(DEB_TARGET_ALIAS)- so this line makes no change whatsoever AFAICT. > mv debian/tmp/usr/share/man/man1/run.1 \ > - debian/gdb$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1; \ > + debian/gdb$(TS)/usr/share/man/man1/$(TP)run.1; \ Same here. > fi > ifeq ($(run_tests),yes) > install -d debian/gdb$(TS)/usr/share/doc/gdb > @@ -212,7 +212,6 @@ > DEB_INSTALL_DOCS_gdb$(TS) = gdb/NEWS gdb/README gdb/doc/refcard.tex \ > objdir/gdb/doc/refcard.dvi objdir/gdb/doc/refcard.ps > DEB_INSTALL_CHANGELOGS_gdb$(TS) = gdb/ChangeLog > -DEB_INSTALL_MANPAGES_gdb$(TS) = gdb/gdb.1 that would, presumably, drop the manpage from the native build too (where $(TS) is undefined). might it be better to put: > ifneq ($(DEB_CROSS),yes) > DEB_INSTALL_MANPAGES_gdb$(TS) += debian/gcore.1 +DEB_INSTALL_MANPAGES_gdb$(TS) = gdb/gdb.1 > endif or maybe: +ifndef GDB_TARGET +DEB_INSTALL_MANPAGES_gdb$(TS) = gdb/gdb.1 +endif ? -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
Attachment:
pgpRQicVcBySP.pgp
Description: PGP signature