From abb5fe7759fd95ca721177973bd2542d472d55f1 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 28 Apr 2003 21:21:00 +0000 Subject: Fix up some stuff for the nognome script Fix up nognome script for Sun 2003-04-28 Rodney Dawes * Makefile.am: Fix up some stuff for the nognome script * evolution-nognome.in: Fix up nognome script for Sun GNOME2 svn path=/trunk/; revision=20996 --- shell/Makefile.am | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'shell/Makefile.am') diff --git a/shell/Makefile.am b/shell/Makefile.am index 5fc76a57f5..d9b4a669ba 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -315,9 +315,21 @@ install-data-local: done \ fi -install-exec-local: +install-evolution: $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) +if HAVE_DTAPPINTEGRATE + +install-exec-local: install-evolution + mkdir -p $(DESTDIR)$(libexecdir) + mv $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) $(DESTDIR)$(libexecdir)/evolution-$(BASE_VERSION) + $(INSTALL_PROGRAM) evolution-nognome $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) + +else + +install-exec-local: install-evolution + +endif # GLib marshalling cruft @@ -366,9 +378,5 @@ CLEANFILES = $(BUILT_SOURCES) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) +noinst_SCRIPTS = evolution-nognome -if HAVE_DTAPPINTEGRATE - -bin_SCRIPTS = evolution-nognome - -endif -- cgit