Mercurial > hg > release > icedtea-web-1.2

changeset 47:5782c25b26dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Search javaws.desktop.in in $(srcdir). 2010-11-24 Matthias Klose <doko@ubuntu.com> * Makefile.am (javaws.desktop): Search javaws.desktop.in in $(srcdir).
author doko@ubuntu.com
date Wed, 24 Nov 2010 14:15:17 +0100
parents e1400d406d85
children 6dd50caf8e76
files ChangeLog Makefile.am
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 24 13:41:57 2010 +0100
+++ b/ChangeLog	Wed Nov 24 14:15:17 2010 +0100
@@ -1,3 +1,7 @@
+2010-11-24  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (javaws.desktop): Search javaws.desktop.in in $(srcdir).
+
 2010-11-24  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (LAUNCHER_LINK): Don't explicitely link with -lc,
--- a/Makefile.am	Wed Nov 24 13:41:57 2010 +0100
+++ b/Makefile.am	Wed Nov 24 14:15:17 2010 +0100
@@ -282,7 +282,7 @@
 	$(CC) $(NETX_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
 
 javaws.desktop: javaws.desktop.in
-	sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < javaws.desktop.in > javaws.desktop
+	sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop
 
 # plugin tests