From e12a6b91ac795fb6e930b810f6aca2939ca5900e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 17 Nov 2009 13:05:16 -0800 Subject: [PATCH] Makefile: Change default install prefix from /usr to /usr/local We'll be a much more polite package this way. And the user can change the prefix by editing Makefile.config. Still to be done is to make configure write out Makefile.config and to add a --prefix option to configure. --- Makefile | 3 +++ Makefile.config | 1 + Makefile.local | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Makefile.config diff --git a/Makefile b/Makefile index 19b51491..436dacfc 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \ include Makefile.local include lib/Makefile.local +# And get user settings from the output of configure +include Makefile.config + %.o: %.cc $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@ diff --git a/Makefile.config b/Makefile.config new file mode 100644 index 00000000..657316e4 --- /dev/null +++ b/Makefile.config @@ -0,0 +1 @@ +prefix = /usr diff --git a/Makefile.local b/Makefile.local index 6573f634..605a3af1 100644 --- a/Makefile.local +++ b/Makefile.local @@ -24,13 +24,13 @@ notmuch.1.gz: gzip --stdout notmuch.1 > notmuch.1.gz install: all notmuch.1.gz - for d in $(DESTDIR)/usr/bin/ $(DESTDIR)/usr/share/man/man1 \ + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ $(DESTDIR)/etc/bash_completion.d/ ; \ do \ install -C -d $$d ; \ done ; - install -C notmuch $(DESTDIR)/usr/bin/ - install -C notmuch.1.gz $(DESTDIR)/usr/share/man/man1/ + install -C notmuch $(DESTDIR)$(prefix)/bin/ + install -C notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ install -C notmuch-completion.bash \ $(DESTDIR)/etc/bash_completion.d/notmuch -- 2.26.2