diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | itweb-settings.desktop.in | 8 |
3 files changed, 24 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2010-12-02 Omair Majid <[email protected]> + + * Makefile.am (EXTRA_DIST): Add itweb-settings.desktop.in. + (all-local): Add itweb-settings.desktop. + (clean-desktop-files): Remove itweb-settings.desktop. + (itweb-settings.desktop): New target. + * itweb-settings.desktop.in: New file. + 2010-12-01 Andrew John Hughes <[email protected]> * acinclude.m4: diff --git a/Makefile.am b/Makefile.am index cf7f38f..d967cbb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,13 +84,14 @@ LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_D -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lz PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG) -EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher +EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \ + itweb-settings.desktop.in # Top-Level Targets # ================= all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \ - javaws.desktop stamps/docs.stamp $(NETX_DIR)/launcher/controlpanel/itweb-settings + javaws.desktop stamps/docs.stamp $(NETX_DIR)/launcher/controlpanel/itweb-settings itweb-settings.desktop clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \ clean-native-ecj clean-desktop-files clean-docs @@ -293,6 +294,7 @@ clean-netx: clean-desktop-files: rm -f javaws.desktop + rm -f itweb-settings.desktop # extras -- used to create about.jar for javaws. extra-source-files.txt: @@ -339,6 +341,10 @@ $(NETX_DIR)/launcher/controlpanel/itweb-settings: $(CONTROLPANEL_LAUNCHER_OBJECT javaws.desktop: javaws.desktop.in sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop +itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in + sed "s#PATH_TO_ITWEB_SETTINGS#$(DESTDIR)$(bindir)/itweb-settings#" \ + < $(srcdir)/itweb-settings.desktop.in > itweb-settings.desktop + # documentation stamps/docs.stamp: stamps/netx-docs.stamp stamps/plugin-docs.stamp diff --git a/itweb-settings.desktop.in b/itweb-settings.desktop.in new file mode 100644 index 0000000..40939a7 --- /dev/null +++ b/itweb-settings.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=IcedTea Web Control Panel +Comment=Configure IcedTea Web (javaws and plugin) +Exec=PATH_TO_ITWEB_SETTINGS +Icon=javaws +Terminal=false +Type=Application +Categories=Settings; |