[network-manager-pptp] build: disable .desktop file for now
- From: Dan Williams <dcbw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-pptp] build: disable .desktop file for now
- Date: Wed, 27 Jan 2010 23:45:03 +0000 (UTC)
commit 943313183cd8f85f79e9b24351a0ebdf22dfb93f
Author: Dan Williams <dcbw redhat com>
Date: Wed Jan 27 15:44:43 2010 -0800
build: disable .desktop file for now
Until nmce gets import support. Otherwise it's pretty useless.
Makefile.am | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eadbb2a..bc8755d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,14 +12,18 @@ dbusservice_DATA = nm-pptp-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-pptp-service.name
-if WITH_GNOME
-desktopdir = $(datadir)/applications
-desktop_in_files = nm-pptp.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
+desktopfile = nm-pptp.desktop.in
+iconfile = gnome-mime-application-x-pptp-settings.png
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-mime-application-x-pptp-settings.png
+if WITH_GNOME
+# FIXME: uncomment when nmce gets --import support
+#desktopdir = $(datadir)/applications
+#desktop_in_files = $(desktopfile)
+#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+# INTLTOOL_DESKTOP_RULE@
+
+#icondir = $(datadir)/icons/hicolor/48x48/apps
+#icon_DATA = $(iconfile)
endif
nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
@@ -27,8 +31,8 @@ nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
EXTRA_DIST = nm-pptp-service.name.in \
$(dbusservice_DATA) \
- $(desktop_in_files) \
- $(icon_DATA) \
+ $(desktopfile) \
+ $(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]