diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/lilypond/findlib.patch')
| -rw-r--r-- | nixpkgs/pkgs/misc/lilypond/findlib.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/misc/lilypond/findlib.patch b/nixpkgs/pkgs/misc/lilypond/findlib.patch new file mode 100644 index 000000000000..30e130bc8ad8 --- /dev/null +++ b/nixpkgs/pkgs/misc/lilypond/findlib.patch @@ -0,0 +1,24 @@ +diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make +index 3825101..bf37d16 100644 +--- a/stepmake/stepmake/executable-vars.make ++++ b/stepmake/stepmake/executable-vars.make +@@ -1,4 +1,4 @@ +-MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) ++MODULE_LIBES =$(addprefix , $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) + LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(CONFIG_LIBS) + + EXECUTABLE = $(outdir)/$(NAME) + +diff --git a/make/stepmake.make b/make/stepmake.make +index 604341b..7f0d9d8 100644 +--- a/make/stepmake.make ++++ b/make/stepmake.make +@@ -87,7 +87,7 @@ outdir=$(outroot)/$(outbase) + config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh + + # The outdir that was configured for: best guess to find binaries +-outconfbase=out$(CONFIGSUFFIX) ++outconfbase=$(outdir) + outconfdir=$(outroot)/$(outconfbase) + + # user package |