From 2c05eeb4193c17eed87f96563c863d7504284b2b Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 13 Aug 2008 10:52:00 -0400 Subject: [PATCH] crm114: reworked installation by patching in `make install_files` --- mail/crm114/crm114.conf | 16 +++----------- mail/crm114/make_install.patch | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 mail/crm114/make_install.patch diff --git a/mail/crm114/crm114.conf b/mail/crm114/crm114.conf index 089edcc21..f4a5d57ef 100644 --- a/mail/crm114/crm114.conf +++ b/mail/crm114/crm114.conf @@ -2,9 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../crm114/crm114.conf -# Copyright (C) 2007 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf +# Copyright (C) 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,13 +12,5 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_append makeopt " " "$crm114opt" -var_append makeintopt " " "$crm114opt" - -hook_add premake 5 'crm114opt="prefix=$root/$prefix"' - -hook_add postmake 3 "mkdir -p $datadir/$pkg \ - && cp -f *.crm *.mfp *.cf $datadir/$pkg" - -hook_add postmake 4 "cp -f *.recipe $docdir/" - +var_append makeinstopt ' ' "prefix=$root/$prefix" +var_append makeinstopt ' ' "install_files" diff --git a/mail/crm114/make_install.patch b/mail/crm114/make_install.patch new file mode 100644 index 000000000..2354e04d2 --- /dev/null +++ b/mail/crm114/make_install.patch @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../crm114/make_install.patch +# Copyright (C) 2008 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./Makefile.orig 2008-08-13 10:11:56.000000000 -0400 ++++ ./Makefile 2008-08-13 10:17:18.000000000 -0400 +@@ -7,6 +7,8 @@ + # + prefix?=/usr + BINDIR=${prefix}/bin ++DOCDIR=${prefix}/share/doc/crm114 ++DATADIR=${prefix}/share/crm114 + + # VER_SUFFIX defines a version suffix for our installed executables, + # handy when you want many versions of CRM114 coexisting. +@@ -474,6 +476,11 @@ + install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX) + -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX) + ++install_files: ++ mkdir -p $(DOCDIR) $(DATADIR) ++ cp -v $(CRMFILES) $(DATADIR) ++ cp -v $(TEXTFILES) $(DOCDIR) ++ + uninstall: FORCE + -rm -rf $(BINDIR)/crm$(VER_SUFFIX) + -rm -rf $(BINDIR)/crmg$(VER_SUFFIX)