Mercurial > hg > release > icedtea-web-1.0

changeset 2:c63223d1132b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2010-10-20 Matthias Klose <doko@ubuntu.com> * Makefile.am: Fix build with builddir != srcdir.
author doko@ubuntu.com
date Wed, 20 Oct 2010 11:57:18 +0200
parents fc0b251243fb
children 96217fb830fb
files ChangeLog Makefile.am
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 19 18:19:19 2010 +0100
+++ b/ChangeLog	Wed Oct 20 11:57:18 2010 +0200
@@ -1,3 +1,7 @@
+2010-10-20  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am: Fix build with builddir != srcdir.
+
 2010-10-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Tue Oct 19 18:19:19 2010 +0100
+++ b/Makefile.am	Wed Oct 20 11:57:18 2010 +0200
@@ -93,7 +93,7 @@
 LAUNCHER_SRCDIR = $(abs_top_srcdir)/launcher
 LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
 PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
-NETX_LAUNCHER_OBJECTS = $(addprefix $(abs_top_builddir)/launcher/,$(LAUNCHER_OBJECTS))
+NETX_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
 LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
 	-g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
 	-DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
@@ -305,6 +305,7 @@
 	-c -o $@ $<
 
 launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
+	mkdir -p launcher
 	$(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
 
 # plugin tests