diff options
| author | Deepak Bhole <[email protected]> | 2010-10-20 14:34:41 +0100 |
|---|---|---|
| committer | Deepak Bhole <[email protected]> | 2010-10-20 14:34:41 +0100 |
| commit | c2783ee992baf5f0598f3125579a73b51ed51ed4 (patch) | |
| tree | 54c04300f901c689b178412760ec2427585e3b87 | |
| parent | 102628c1172b47fc92d034a11c589ed69a37bfb6 (diff) | |
Add $(NETX_DIR) prefix to javaws launcher.
2010-10-19 Deepak Bhole <[email protected]>
* Makefile.am:
($(NETX_DIR)/launcher/javaws): Use $(NETX_DIR).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,11 @@ 2010-10-19 Deepak Bhole <[email protected]> * Makefile.am: + ($(NETX_DIR)/launcher/javaws): Use $(NETX_DIR). + +2010-10-19 Deepak Bhole <[email protected]> + + * Makefile.am: (NETX_DIR): New variable representing the NetX build dir. (NETX_LAUNCHER_OBJECTS): Prefix with $(NETX_DIR). (LAUNCHER_LINK): Fixed escaping of ORIGIN to the rpath argument. diff --git a/Makefile.am b/Makefile.am index 600a6b5..20a866a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -306,7 +306,7 @@ $(NETX_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' -DPROGNAME='"javaws"' \ -c -o $@ $< -launcher/javaws: $(NETX_LAUNCHER_OBJECTS) +$(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS) mkdir -p launcher $(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS) |