From 6abb86dff625da595d860be999b1e8b774d29b3b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 4 Apr 2011 13:52:25 -0400 Subject: [PATCH] src/Makefile.am: two fixes to the gnome-shell wrapper handling Add an uninstall-hook to undo the effect of install-exec-hook, and add an $(AM_V_GEN) to the rule that copies either gnome-shell-real or gnome-shell-jhbuild to gnome-shell. https://bugzilla.gnome.org/show_bug.cgi?id=646730 --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index eb211206c..31ff58b8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,9 +29,11 @@ endif noinst_DATA = gnome-shell gnome-shell: $(gnome_shell) Makefile - cp $< $@.tmp && mv $@.tmp $@ + $(AM_V_GEN) cp $< $@.tmp && mv $@.tmp $@ install-exec-hook: mv $(DESTDIR)$(bindir)/$(gnome_shell) $(DESTDIR)$(bindir)/gnome-shell +uninstall-hook: + rm -f $(DESTDIR)$(bindir)/gnome-shell generated_script_substitutions = \ -e "s|@bindir[@]|$(bindir)|" \