154215cfd8
Trying to understand what each patch does made me come up with some more descriptive names: - Renaming the two disable-xxx patches to a common names makes it immediately clear that one replaces the other depending on version number. - findstring was really not descriptive at all. - hardcode-pgxs-path will be extended with more paths for split outputs in a later commit. Renaming here already to allow git to better track renames. Finally replacing HARDCODED_PGXS_PATH with $out/lib in the last patch, makes it easier to understand what the end result will look like when reading the patch.
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
Nix outputs put the `name' in each store path like
|
|
/nix/store/...-<name>. This was confusing the Postgres make script
|
|
because it thought its data directory already had postgresql in its
|
|
directory. This lead to Postgres installing all of its fils in
|
|
$out/share. To fix this, we just look for postgres or psql in the part
|
|
after the / using make's notdir.
|
|
|
|
---
|
|
--- a/src/Makefile.global.in
|
|
+++ b/src/Makefile.global.in
|
|
@@ -102,15 +102,15 @@ datarootdir := @datarootdir@
|
|
bindir := @bindir@
|
|
|
|
datadir := @datadir@
|
|
-ifeq "$(findstring pgsql, $(datadir))" ""
|
|
-ifeq "$(findstring postgres, $(datadir))" ""
|
|
+ifeq "$(findstring pgsql, $(notdir $(datadir)))" ""
|
|
+ifeq "$(findstring postgres, $(notdir $(datadir)))" ""
|
|
override datadir := $(datadir)/postgresql
|
|
endif
|
|
endif
|
|
|
|
sysconfdir := @sysconfdir@
|
|
-ifeq "$(findstring pgsql, $(sysconfdir))" ""
|
|
-ifeq "$(findstring postgres, $(sysconfdir))" ""
|
|
+ifeq "$(findstring pgsql, $(notdir $(sysconfdir)))" ""
|
|
+ifeq "$(findstring postgres, $(notdir $(sysconfdir)))" ""
|
|
override sysconfdir := $(sysconfdir)/postgresql
|
|
endif
|
|
endif
|
|
@@ -136,8 +136,8 @@ endif
|
|
mandir := @mandir@
|
|
|
|
docdir := @docdir@
|
|
-ifeq "$(findstring pgsql, $(docdir))" ""
|
|
-ifeq "$(findstring postgres, $(docdir))" ""
|
|
+ifeq "$(findstring pgsql, $(notdir $(docdir)))" ""
|
|
+ifeq "$(findstring postgres, $(notdir $(docdir)))" ""
|
|
override docdir := $(docdir)/postgresql
|
|
endif
|
|
endif
|