nixpkgs/pkgs/misc/lilypond/findlib.patch
Marc Weber 3201717bdb adding lilypond
svn path=/nixpkgs/trunk/; revision=17028
2009-09-10 16:57:56 +00:00

25 lines
915 B
Diff

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