Skip to content

Commit 5df5bea

Browse files
committed
Fix the install rule for snowball_create.sql.
This file could be in the current (build) directory if we just built it. However, when installing from a VPATH build from a tarball, it will exist in the source directory and gmake will therefore not rebuild it. Use the $< macro to find out where gmake found it. Oversight in b3a0d83, which also exposes a buildfarm testing gap: we test install from VPATH builds from bare source trees, but not from tarballs. Per report from Christoph Berg. Discussion: https://postgr.es/m/ZGzEAqjxkkoY3ooH@msg.df7cb.de
1 parent 0ffbe6e commit 5df5bea

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/backend/snowball/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,13 @@ $(SQLSCRIPT): snowball_create.pl snowball_func.sql.in snowball.sql.in
106106

107107
distprep: $(SQLSCRIPT)
108108

109-
install: all installdirs install-lib
110-
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
109+
install: all installdirs install-lib install-script
111110
$(INSTALL_DATA) $(addprefix $(srcdir)/stopwords/,$(stop_files)) '$(DESTDIR)$(datadir)/$(DICTDIR)'
112111

112+
# $(SQLSCRIPT) might be in the srcdir or the build dir
113+
install-script: $(SQLSCRIPT)
114+
$(INSTALL_DATA) $< '$(DESTDIR)$(datadir)'
115+
113116
installdirs: installdirs-lib
114117
$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
115118

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy