diff options
| author | Carl Worth <cworth@cworth.org> | 2010-04-06 18:44:12 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-04-06 18:44:20 -0700 |
| commit | 7d9851e293fad762cd959e9be819e48a26087cdc (patch) | |
| tree | 282711dc64d5fa7d82f001ea173ad2e79e91e882 /lib | |
| parent | 9ed5e095a81f23b286a10a4fd51c09769c8d62ee (diff) | |
| parent | e7837ace186a09508140193c1dabe3317dadf797 (diff) | |
Merge branch 'debian'
These are the changes made between the notmuch 0.1 release and the
release of Debian version 0.1-1. It's mostly changes to the debian
directory, of course, but does also include some generally useful
Makefile improvements.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.local | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/Makefile.local b/lib/Makefile.local index c98fb67..0e3a4d1 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -51,23 +51,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) - $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ + $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ $(dir)/$(SONAME): $(dir)/$(LIBNAME) - $(call quiet_symlink, $(LIBNAME) $@) + ln -sf $(LIBNAME) $@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) - $(call quiet_symlink, $(LIBNAME) $@) + ln -sf $(LIBNAME) $@ install: install-$(dir) install-$(dir): - $(call quiet_mkdir, $(DESTDIR)$(libdir)/) - $(call quiet_install_data, $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/) - $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)) - $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/) - $(call quiet_install_data, $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/) + mkdir -p $(DESTDIR)$(libdir)/ + install -m0644 $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/ + ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME) + ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME) + mkdir -p $(DESTDIR)$(includedir) + install -m0644 $(dir)/notmuch.h $(DESTDIR)$(includedir)/ SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a |