On Sat, Nov 01, 2003 at 07:37:04AM +0100, Ben Burton wrote: > CVS commit by benb: > > Force a rerun of automake/etc since the debian patches require it. > > > M +8 -4 rules 1.93 > > > --- koffice/debian/rules #1.92:1.93 > @@ -63,7 +63,11 @@ > > # KDE CVS does not have aclocal.m4 or configure > - if test ! -f configure; then \ > - $(MAKE) -f admin/Makefile.common ;\ > - fi > + # if test ! -f configure; then \ > + # $(MAKE) -f admin/Makefile.common ;\ > + # fi > + > + # Force a rerun of automake/etc since this is required by the > + # debian patches. > + $(MAKE) -f admin/Makefile.common ;\ This really shouldn't be done like this since it requires autotools for the build environment. The way I have been working around it myself is to have the autotools stuff installed in my chroot for the initial build (eg not buildd's) then after the patches are applied run make -f admin/Makefile.common by hand so that they are included in the diff.gz. However, if you do this you will need the AM_MAINTAINER_MODE patch as well, which actually is probably faster regardless since it disables the automake up to date checks. BTW - I have also started using pristine tagged cvs export's (eg KDE_3_1_4_RELEASE) then runing make -f admin/Makefile.common once, removing the automake cache dir and then taring that as the orig.tar.gz. Everything else I change I put into patches. Apparently this helps make the security team much more happier than having random stuff in the diff.gz (like all of a BRANCH update). ;) I hope the above made sense its 2am here. Chris
Attachment:
signature.asc
Description: Digital signature