From: Tom Lane <tgl@sss.pgh.pa.us>
To: Christoph Berg <myon@debian.org>
cc: Andres Freund <andres@anarazel.de>,
        PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>,
        PostgreSQL Packagers <pgsql-packagers@lists.postgresql.org>
Subject: Re: pgsql: Move snowball_create.sql creation into perl file
In-reply-to: <ZGzIYsCF0cpeAPWP@msg.df7cb.de>
References: <E1oDWqn-000ADG-P9@gemulon.postgresql.org> <ZGzEAqjxkkoY3ooH@msg.df7cb.de> <ZGzIYsCF0cpeAPWP@msg.df7cb.de>
Comments: In-reply-to Christoph Berg <myon@debian.org>
	message dated "Tue, 23 May 2023 16:06:26 +0200"
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Content-ID: <933419.1684853162.0@sss.pgh.pa.us>
Date: Tue, 23 May 2023 10:46:30 -0400
Message-ID: <933499.1684853190@sss.pgh.pa.us>
Archived-At: <https://www.postgresql.org/message-id/933499.1684853190%40sss.pgh.pa.us>
Precedence: bulk

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <933419.1684853162.1@sss.pgh.pa.us>
Content-Transfer-Encoding: quoted-printable

Christoph Berg <myon@debian.org> writes:
>> this seems to have broken out-of-tree builds from tarballs:
>> =

>> /usr/bin/install -c -m 644 snowball_create.sql '/srv/projects/postgresq=
l/debian/16/build/tmp_install/usr/share/postgresql/16'
>> /usr/bin/install: cannot stat 'snowball_create.sql': No such file or di=
rectory

I think the attached will do for a proper fix.  I'm not inclined
to re-wrap just for this.

			regards, tom lane


------- =_aaaaaaaaaa0
Content-Type: text/x-diff; name="fix-snowball-install-rule.patch";
	charset="us-ascii"
Content-ID: <933419.1684853162.2@sss.pgh.pa.us>
Content-Description: fix-snowball-install-rule.patch
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index 29076371db..4bebfa0250 100644
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -106,10 +106,13 @@ $(SQLSCRIPT): snowball_create.pl snowball_func.sql.i=
n snowball.sql.in
 =

 distprep: $(SQLSCRIPT)
 =

-install: all installdirs install-lib
-	$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
+install: all installdirs install-lib install-script
 	$(INSTALL_DATA) $(addprefix $(srcdir)/stopwords/,$(stop_files)) '$(DESTD=
IR)$(datadir)/$(DICTDIR)'
 =

+# $(SQLSCRIPT) might be in the srcdir or the build dir
+install-script: $(SQLSCRIPT)
+	$(INSTALL_DATA) $< '$(DESTDIR)$(datadir)'
+
 installdirs: installdirs-lib
 	$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
 =


------- =_aaaaaaaaaa0--