Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3e2bd314 3e2bd31415674c8b831a2421fd36991a94880827 by Sergey Poznyakoff
Options

Install binaries into a separate directory to prevent namespace pollution.

1 parent 2a89f9e6
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
...@@ -58,6 +58,7 @@ EXTRA_PROGRAMS = \ ...@@ -58,6 +58,7 @@ EXTRA_PROGRAMS = \
58 LIBRARIES_MH = libmh.a 58 LIBRARIES_MH = libmh.a
59 EXTRA_LIBRARIES = libmh.a 59 EXTRA_LIBRARIES = libmh.a
60 60
61 bindir = @MH_BIN_DIR@
61 mhlibdir = $(pkgdatadir)/mh 62 mhlibdir = $(pkgdatadir)/mh
62 bin_PROGRAMS = @BUILD_MH_PROGRAMS@ 63 bin_PROGRAMS = @BUILD_MH_PROGRAMS@
63 noinst_LIBRARIES = @BUILD_MH_LIBRARIES@ 64 noinst_LIBRARIES = @BUILD_MH_LIBRARIES@
...@@ -74,6 +75,7 @@ libmh_a_SOURCES= \ ...@@ -74,6 +75,7 @@ libmh_a_SOURCES= \
74 mh_fmtgram.c\ 75 mh_fmtgram.c\
75 mh_msgset.c\ 76 mh_msgset.c\
76 mh_sequence.c\ 77 mh_sequence.c\
78 mh_stream.c\
77 mh_whatnow.c 79 mh_whatnow.c
78 noinst_HEADERS = mh.h mh_getopt.h 80 noinst_HEADERS = mh.h mh_getopt.h
79 81
...@@ -99,7 +101,7 @@ mailutils-mh.el: mailutils-mh.eli ...@@ -99,7 +101,7 @@ mailutils-mh.el: mailutils-mh.eli
99 sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@ 101 sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
100 102
101 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@ 103 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
102 AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" 104 AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
103 mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ 105 mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
104 LDADD = $(mh_LIBS) 106 LDADD = $(mh_LIBS)
105 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ 107 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
...@@ -120,7 +122,7 @@ mh_fmtgram.c: $(srcdir)/mh_fmtgram.y ...@@ -120,7 +122,7 @@ mh_fmtgram.c: $(srcdir)/mh_fmtgram.y
120 122
121 123
122 install-exec-hook: @BUILD_MH_EXEC_HOOK@ 124 install-exec-hook: @BUILD_MH_EXEC_HOOK@
123 125
124 mh_finish_install: 126 mh_finish_install:
125 @here=`pwd`; \ 127 @here=`pwd`; \
126 cd $(DESTDIR); \ 128 cd $(DESTDIR); \
......