debian/rules: Extend generated-sources cleanup to objtools/eutils.

Not entirely straightforward due to input format variation.

diff --git a/debian/changelog b/debian/changelog
index f02392b80b00f66a3b0c290703e93bf3c2622a10..d70e18635d333744bf366d328cb85bfe0abc74a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,10 @@ ncbi-blast+ (2.15.0+ds-1) UNRELEASED; urgency=medium
     - Tune flags: Add --without-strip to make --with-symbols effective;
       switch off warnings from __DATE__/__TIME__ usage, since
       dpkg-buildpackage's SOURCE_DATE_EPOCH injection should suffice.
+    - Extend generated-sources cleanup to objtools/eutils (not entirely
+      straightforward due to input format variation).
 
- -- Aaron M. Ucko <ucko@debian.org>  Wed, 17 Jul 2024 21:39:28 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 17 Jul 2024 21:43:42 -0400
 
 ncbi-blast+ (2.12.0+ds-4) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index c342c3483b67a6c31778e84f644d2e77a1ed46d7..42a4eb0be99449658da405da5f4c6772d2a09519 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -140,6 +140,7 @@ override_dh_install-indep:
            chmod +x $(leg_bin)/$$x; \
        done
 
+NEW_MODULE = $(CURDIR)/c++/BUILD$(NATIVE)/build/new_module.sh
 override_dh_clean:
        cp c++/src/util/lmdb/Makefile.orig c++/src/util/lmdb/Makefile.orig.save
        cp c++/src/util/lmdbxx/Makefile.orig c++/src/util/lmdbxx/Makefile.orig.save
@@ -155,11 +156,21 @@ override_dh_clean:
                mods="`echo *.module`" ; \
                [ "$${mods#*\*}" = "$$mods" ] || mods="`basename $$x`" ; \
                for mod in $$mods ; do \
-                   ../../../BUILD$(NATIVE)/build/new_module.sh $$mod \
-                       purge_sources ; \
+                   $(NEW_MODULE) $$mod purge_sources ; \
                done ) ; \
            ) ; \
        done
+       -for x in c++/src/objtools/eutils/* ; do \
+           (cd "$$x"  && ( \
+               mods="`echo *.module`" ; \
+               [ "$${mods#*\*}" = "$$mods" ] || mods="`basename $$x`" ; \
+               for mod in $$mods ; do \
+                   $(NEW_MODULE) --dtd $$mod purge_sources ; \
+               done ) ; \
+           ) ; \
+       done
+       -cd c++/src/objtools/eutils/efetch  && \
+            $(NEW_MODULE) --xsd efetch purge_sources
        rm -rf c++/compilers/dll c++/config.log c++/Makefile
        rm -f c++/configure.lineno c++/src/objects/blastxml/blastxml.module
        rm -f c++/include/common/ncbi_revision.h