summary refs log tree commit diff
path: root/pkgs/misc/lilypond/findlib.patch
blob: 30e130bc8ad8440e8098bffb73d458f538c14302 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
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