From 2e8488e23c1b6e41d078800c794aac92081b3f70 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sat, 15 Jun 2024 02:05:52 -0700 Subject: [PATCH] build: Fix include paths in Makefiles. * libmailutils/address/Makefile.am (AM_CPPFLAGS): Include libmailutils relative to $(top_srcdir). * libmailutils/auth/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/base/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/cfg/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/cidr/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/cli/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/datetime/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/diag/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/imapio/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/list/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/locus/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/mailbox/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/mailcap/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/mailer/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/mime/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/mimetypes/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/msgset/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/opt/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/property/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/server/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/sockaddr/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/stdstream/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/stream/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/url/Makefile.am (AM_CPPFLAGS): Likewise. * libmailutils/wicket/Makefile.am (AM_CPPFLAGS): Likewise. --- libmailutils/address/Makefile.am | 2 +- libmailutils/auth/Makefile.am | 2 +- libmailutils/base/Makefile.am | 2 +- libmailutils/cfg/Makefile.am | 2 +- libmailutils/cidr/Makefile.am | 2 +- libmailutils/cli/Makefile.am | 2 +- libmailutils/datetime/Makefile.am | 2 +- libmailutils/diag/Makefile.am | 2 +- libmailutils/imapio/Makefile.am | 2 +- libmailutils/list/Makefile.am | 2 +- libmailutils/locus/Makefile.am | 2 +- libmailutils/mailbox/Makefile.am | 2 +- libmailutils/mailcap/Makefile.am | 2 +- libmailutils/mailer/Makefile.am | 2 +- libmailutils/mime/Makefile.am | 2 +- libmailutils/mimetypes/Makefile.am | 2 +- libmailutils/msgset/Makefile.am | 2 +- libmailutils/opt/Makefile.am | 2 +- libmailutils/property/Makefile.am | 2 +- libmailutils/server/Makefile.am | 2 +- libmailutils/sockaddr/Makefile.am | 2 +- libmailutils/stdstream/Makefile.am | 2 +- libmailutils/stream/Makefile.am | 2 +- libmailutils/url/Makefile.am | 2 +- libmailutils/wicket/Makefile.am | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libmailutils/address/Makefile.am b/libmailutils/address/Makefile.am index 8536d1deb..45f3a6e33 100644 --- a/libmailutils/address/Makefile.am +++ b/libmailutils/address/Makefile.am @@ -22,4 +22,4 @@ libaddress_la_SOURCES = \ addrstream.c\ parse822.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/auth/Makefile.am b/libmailutils/auth/Makefile.am index 5f635ce56..4c408246c 100644 --- a/libmailutils/auth/Makefile.am +++ b/libmailutils/auth/Makefile.am @@ -22,4 +22,4 @@ libauth_la_SOURCES = \ mu_auth.c\ system.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am index 526992b5d..0675a7067 100644 --- a/libmailutils/base/Makefile.am +++ b/libmailutils/base/Makefile.am @@ -77,7 +77,7 @@ libbase_la_SOURCES = \ localedir = $(datadir)/locale AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\ + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils\ -DSYSCONFDIR=\"$(sysconfdir)\"\ -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\ -DLOCALEDIR=\"$(localedir)\" diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am index 9d44284c9..14d748fb5 100644 --- a/libmailutils/cfg/Makefile.am +++ b/libmailutils/cfg/Makefile.am @@ -25,7 +25,7 @@ libcfg_la_SOURCES = \ localedir = $(datadir)/locale AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\ + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils\ -DSYSCONFDIR=\"$(sysconfdir)\"\ -DLOCALEDIR=\"$(localedir)\" diff --git a/libmailutils/cidr/Makefile.am b/libmailutils/cidr/Makefile.am index 524c8d25a..34c5cf5a5 100644 --- a/libmailutils/cidr/Makefile.am +++ b/libmailutils/cidr/Makefile.am @@ -24,4 +24,4 @@ libcidr_la_SOURCES = \ tosa.c\ tostr.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/cli/Makefile.am b/libmailutils/cli/Makefile.am index 82738a068..169ec0241 100644 --- a/libmailutils/cli/Makefile.am +++ b/libmailutils/cli/Makefile.am @@ -25,4 +25,4 @@ libcli_la_SOURCES = \ stdcapa.c AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/datetime/Makefile.am b/libmailutils/datetime/Makefile.am index dac744689..06902a2a2 100644 --- a/libmailutils/datetime/Makefile.am +++ b/libmailutils/datetime/Makefile.am @@ -39,5 +39,5 @@ parsedate.c: parsedate.y .y.c: $(BISON) -o $@ $(AM_YFLAGS) $< -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/diag/Makefile.am b/libmailutils/diag/Makefile.am index d0d5b4949..dcd8f739f 100644 --- a/libmailutils/diag/Makefile.am +++ b/libmailutils/diag/Makefile.am @@ -26,7 +26,7 @@ libdiag_la_SOURCES = \ syslog.c\ wd.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils EXTRA_DIST = \ debcat\ diff --git a/libmailutils/imapio/Makefile.am b/libmailutils/imapio/Makefile.am index 5a155b130..0e04a40a6 100644 --- a/libmailutils/imapio/Makefile.am +++ b/libmailutils/imapio/Makefile.am @@ -40,5 +40,5 @@ libimapio_la_SOURCES = \ words.c\ xscript.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/list/Makefile.am b/libmailutils/list/Makefile.am index a36556ae2..687527b76 100644 --- a/libmailutils/list/Makefile.am +++ b/libmailutils/list/Makefile.am @@ -52,5 +52,5 @@ liblist_la_SOURCES = \ sort.c\ tail.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/locus/Makefile.am b/libmailutils/locus/Makefile.am index 5e511b368..20e9f92c9 100644 --- a/libmailutils/locus/Makefile.am +++ b/libmailutils/locus/Makefile.am @@ -27,5 +27,5 @@ liblocus_la_SOURCES = \ EXTRA_DIST = genprloc.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/mailbox/Makefile.am b/libmailutils/mailbox/Makefile.am index 9126d15bf..2ed143cfb 100644 --- a/libmailutils/mailbox/Makefile.am +++ b/libmailutils/mailbox/Makefile.am @@ -56,4 +56,4 @@ libmailbox_la_SOURCES = \ msguid.c\ msguidl.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/mailcap/Makefile.am b/libmailutils/mailcap/Makefile.am index ea66d57ea..746180545 100644 --- a/libmailutils/mailcap/Makefile.am +++ b/libmailutils/mailcap/Makefile.am @@ -39,4 +39,4 @@ libmailcap_la_SOURCES = \ parse.c\ parsefile.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/mailer/Makefile.am index fef4ccf55..fbe293eab 100644 --- a/libmailutils/mailer/Makefile.am +++ b/libmailutils/mailer/Makefile.am @@ -21,4 +21,4 @@ libmailer_la_SOURCES = \ mailer.c\ progmailer.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/mime/Makefile.am b/libmailutils/mime/Makefile.am index 27c3fc321..9f662c4ec 100644 --- a/libmailutils/mime/Makefile.am +++ b/libmailutils/mime/Makefile.am @@ -24,4 +24,4 @@ libmime_la_SOURCES = \ mimehdrset.c\ mimeitr.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/mimetypes/Makefile.am b/libmailutils/mimetypes/Makefile.am index 6899a296c..4a1bc921b 100644 --- a/libmailutils/mimetypes/Makefile.am +++ b/libmailutils/mimetypes/Makefile.am @@ -6,7 +6,7 @@ libmimetypes_la_SOURCES = \ eval.c AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils AM_YFLAGS=-vtd AM_LFLAGS=-d diff --git a/libmailutils/msgset/Makefile.am b/libmailutils/msgset/Makefile.am index 4c3d4b1d5..c52920dcd 100644 --- a/libmailutils/msgset/Makefile.am +++ b/libmailutils/msgset/Makefile.am @@ -44,5 +44,5 @@ libmsgset_la_SOURCES = \ subset.c\ trans.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/opt/Makefile.am b/libmailutils/opt/Makefile.am index f95981e95..bca834331 100644 --- a/libmailutils/opt/Makefile.am +++ b/libmailutils/opt/Makefile.am @@ -23,4 +23,4 @@ libopt_la_SOURCES = \ progname.c AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/property/Makefile.am b/libmailutils/property/Makefile.am index 6dae1493c..58799ac57 100644 --- a/libmailutils/property/Makefile.am +++ b/libmailutils/property/Makefile.am @@ -27,4 +27,4 @@ libproperty_la_SOURCES = \ propinv.c\ propset.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/server/Makefile.am b/libmailutils/server/Makefile.am index e255ca4e0..264d5c9ec 100644 --- a/libmailutils/server/Makefile.am +++ b/libmailutils/server/Makefile.am @@ -24,4 +24,4 @@ libserver_la_SOURCES = \ ipsrv.c\ sid.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/sockaddr/Makefile.am b/libmailutils/sockaddr/Makefile.am index 9a3f7cb07..07d3fa041 100644 --- a/libmailutils/sockaddr/Makefile.am +++ b/libmailutils/sockaddr/Makefile.am @@ -30,4 +30,4 @@ libsockaddr_la_SOURCES = \ unlink.c\ url.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/stdstream/Makefile.am b/libmailutils/stdstream/Makefile.am index 5c229d7b8..6ade747f3 100644 --- a/libmailutils/stdstream/Makefile.am +++ b/libmailutils/stdstream/Makefile.am @@ -22,4 +22,4 @@ libstdstream_la_SOURCES = \ dbgstream.c\ strerr.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/stream/Makefile.am b/libmailutils/stream/Makefile.am index 8de3f6f08..1902507fd 100644 --- a/libmailutils/stream/Makefile.am +++ b/libmailutils/stream/Makefile.am @@ -45,4 +45,4 @@ libstream_la_SOURCES = \ wordwrap.c\ xscript-stream.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/url/Makefile.am b/libmailutils/url/Makefile.am index 3d2f42e70..bd13869f4 100644 --- a/libmailutils/url/Makefile.am +++ b/libmailutils/url/Makefile.am @@ -55,5 +55,5 @@ liburl_la_SOURCES = \ urlinv.c\ urlstr.c -AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils +AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils diff --git a/libmailutils/wicket/Makefile.am b/libmailutils/wicket/Makefile.am index b0dd42be4..5467a94dc 100644 --- a/libmailutils/wicket/Makefile.am +++ b/libmailutils/wicket/Makefile.am @@ -22,7 +22,7 @@ libwicket_la_SOURCES = \ localedir = $(datadir)/locale AM_CPPFLAGS = \ - $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\ + $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils\ -DSYSCONFDIR=\"$(sysconfdir)\"\ -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\ -DLOCALEDIR=\"$(localedir)\" -- 2.45.2