diff options
author | Guido Günther <agx@sigxcpu.org> | 2016-07-20 17:21:52 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2016-07-20 17:21:52 +0200 |
commit | 7728e51fc122ff774dd74eb9cd4be7aa015108ff (patch) | |
tree | 3597b3ace068bfd9ddf086cca760c1dbb041c1ce /Makefile.am | |
parent | ccd4ecb9f9be08744857cd2af4b6ebffe6ec3729 (diff) | |
parent | 1941852d75827b26142cda627b0c948a27641194 (diff) |
Merge tag 'v1.2.0' into debian/sid
Release network-manager-iodine 1.2.0
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 24174e0..35a5565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,13 +17,28 @@ nmvpnservicedir = $(NM_VPN_SERVICE_DIR) nmvpnservice_DATA = nm-iodine-service.name if WITH_LIBNM_GLIB -nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnoldservice_DATA = nm-iodine-service.name +# Install a file with full path to plugins for an old gnome-shell +# https://bugzilla.gnome.org/show_bug.cgi?id=693590 +install-data-hook: + mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN + sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \ + -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ + -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + <$(srcdir)/nm-iodine-service.name.in \ + >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name + +uninstall-hook: + rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name endif +appdatadir = $(datadir)/appdata +appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_in_files = appdata/network-manager-iodine.appdata.xml.in +@INTLTOOL_XML_RULE@ + nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \ $< >$@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes @@ -32,11 +47,16 @@ EXTRA_DIST = nm-iodine-service.name.in \ $(dbusservice_DATA) \ $(desktop_in_files) \ $(icon_DATA) \ + $(appdata_in_files) \ + $(appdata_DATA) \ intltool-extract.in \ intltool-merge.in \ intltool-update.in -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ +CLEANFILES = $(nmvpnservice_DATA) \ + $(desktop_DATA) \ + $(appdata_DATA) + DISTCLEANFILES = intltool-extract intltool-merge intltool-update ACLOCAL_AMFLAGS = -I m4 |