On 10/19/21 11:22 PM, Michael Paquier wrote: > On Tue, Oct 19, 2021 at 10:16:06PM +0200, Erik Rijkers wrote: >>> [0001-move-perl-test-modules-to-PostgreSQL-Test-namespace.patch ] >>> [0002-move-PostgreSQL-Test-PostgresVersion-up-in-the-names.patch] > It seems to me that the hardest part is sorted out with the naming and > pathing of the modules, so better to apply them sooner than later.
Yeah, my plan is to apply it today or tomorrow > >> Those patches gave some complains about PostgreSQL/Test/PostgresVersion.pm >> being absent so I added this deletion. I'm not sure that's correct but it >> enabled the build and check-world ran without errors. > Your change is incorrect, as we want to install PostgresVersion.pm. > What's needed here is the following: > {PostgresVersion.pm => PostgreSQL/Version.pm} > > And so the patch needs to be changed like that: > - $(INSTALL_DATA) $(srcdir)/PostgreSQL/Test/PostgresVersion.pm > '$(DESTDIR)$(pgxsdir)/$(subdir)/PostgreSQL/Test/PostgresVersion.pm' > + $(INSTALL_DATA) $(srcdir)/PostgreSQL/Version.pm > '$(DESTDIR)$(pgxsdir)/$(subdir)/PostgreSQL/Version.pm' > [...] > - rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/PostgreSQL/Test/PostgresVersion.pm' > + rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/PostgreSQL/Version.pm' right. There are one or two other cosmetic changes too. cheers andrew -- Andrew Dunstan EDB: https://www.enterprisedb.com