Merge branch 'maint'

[debian/gnuradio] / grc / freedesktop / Makefile.am

diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index fab6f87adce81026bb430ffdfcc9515738dde6dd..f6aa97a93ad63f94a37dd965a5beb3f3964451b1 100644 (file)
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -19,10 +19,9 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.inc
-
-ourdatadir = $(grc_data_prefix)/freedesktop
+include $(top_srcdir)/Makefile.common
 
+ourdatadir = $(pkgdatadir)/grc/freedesktop
 dist_ourdata_DATA = \
        grc-icon-256.png \
        grc-icon-128.png \
@@ -34,23 +33,23 @@ dist_ourdata_DATA = \
        gnuradio-usrp2_probe.desktop \
        gnuradio-usrp_probe.desktop
 
-dist_bin_SCRIPTS = grc_setup_freedesktop
+pkglibexecdir = $(libexecdir)/$(PACKAGE)
+dist_pkglibexec_SCRIPTS = grc_setup_freedesktop
 
-grc_setup_freedesktop: Makefile grc_setup_freedesktop.in
-       sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@
+grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile
+       sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@
 
 EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in
 BUILT_SOURCES = grc_setup_freedesktop
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
 
 install-data-hook:
        @printf "\n*** GRC Post-Install Message ***\
        \nTo install icons, mime type, and menu items\
        \nfor a freedesktop.org system (Gnome/KDE/Xfce):\
-       \n  >>> sudo grc_setup_freedesktop install\n\n"
+       \n  >>> sudo $(pkglibexecdir)/grc_setup_freedesktop install\n\n"
 
 uninstall-hook:
        @printf "\n*** GRC Post-Uninstall Message ***\
        \nTo uninstall icons, mime type, and menu items\
        \nfor a freedesktop.org system (Gnome/KDE/Xfce):\
-       \n  >>> sudo grc_setup_freedesktop uninstall\n\n"
+       \n  >>> sudo $(pkglibexecdir)/grc_setup_freedesktop uninstall\n\n"