diff options
| author | doko <[email protected]> | 2010-11-24 14:15:17 +0100 |
|---|---|---|
| committer | doko <[email protected]> | 2010-11-24 14:15:17 +0100 |
| commit | 885472d0392efe44a2ad600612d91631479969ad (patch) | |
| tree | 9b904ae854587f19e32cea0c68e118a586ff1101 | |
| parent | 419d9f2ccbf1e0c018d0c8396b16177dc2cc40cb (diff) | |
Search javaws.desktop.in in $(srcdir).
2010-11-24 Matthias Klose <[email protected]>
* Makefile.am (javaws.desktop): Search javaws.desktop.in in $(srcdir).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,9 @@ 2010-11-24 Matthias Klose <[email protected]> + * Makefile.am (javaws.desktop): Search javaws.desktop.in in $(srcdir). + +2010-11-24 Matthias Klose <[email protected]> + * Makefile.am (LAUNCHER_LINK): Don't explicitely link with -lc, link with -pthread instead of -lpthread. (LAUNCHER_FLAGS): Add -pthread. diff --git a/Makefile.am b/Makefile.am index d9b10b9..5f4d8ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,7 +282,7 @@ $(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS) $(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 |