1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-14 23:46:10 +00:00
freebsd-ports/mail/nmh/files/patch-ab
1998-01-05 20:25:44 +00:00

140 lines
4.5 KiB
Plaintext

diff -udr ../nmh-0.19.ORIG/Makefile.in ./Makefile.in
--- ../nmh-0.19.ORIG/Makefile.in Sat Jul 26 06:38:35 1997
+++ ./Makefile.in Mon Jan 5 20:29:42 1998
@@ -26,7 +26,7 @@
bindir = @bindir@
# location of support binaries and scripts
-libdir = @libdir@
+libexecdir = @libexecdir@
# location of nmh configuration and formats files
etcdir = @sysconfdir@
@@ -59,12 +59,13 @@
MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
+etcdir='$(etcdir)' libexecdir='$(libexecdir)' mandir='$(mandir)' \
mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
default_editor='$(default_editor)' default_pager='$(default_pager)'
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
.SUFFIXES:
diff -udr ../nmh-0.19.ORIG/configure.in ./configure.in
--- ../nmh-0.19.ORIG/configure.in Wed Dec 17 01:18:12 1997
+++ ./configure.in Mon Jan 5 20:20:08 1998
@@ -400,7 +400,7 @@
eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}"
eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
-eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}"
+eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}"
eval "nmhman=${mandir}"
echo "
@@ -413,7 +413,7 @@
linker flags : ${LDFLAGS}
source code location : ${srcdir}
binary install path : ${nmhbin2}
-libary install path : ${nmhlib2}
+libexec install path : ${nmhlib2}
config files install path : ${nmhsysconf2}
man page install path : ${nmhman}"
echo ""
diff -udr ../nmh-0.19.ORIG/support/general/Makefile.in ./support/general/Makefile.in
--- ../nmh-0.19.ORIG/support/general/Makefile.in Tue Dec 23 14:05:49 1997
+++ ./support/general/Makefile.in Mon Jan 5 20:22:42 1998
@@ -13,11 +13,12 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-libdir = @libdir@
+libexecdir = @libexecdir@
etcdir = @sysconfdir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
# Path to search for programs to display content
@@ -77,9 +78,9 @@
done
install-scripts:
- $(top_srcdir)/mkinstalldirs $(libdir)
+ $(top_srcdir)/mkinstalldirs $(libexecdir)
for script in $(SCRIPTS); do \
- $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$script $(libexecdir)/$$script; \
done
uninstall: uninstall-files uninstall-scripts
@@ -91,7 +92,7 @@
uninstall-scripts:
for script in $(SCRIPTS); do \
- rm -f $(libdir)/$$script; \
+ rm -f $(libexecdir)/$$script; \
done
# ========== DEPENDENCIES FOR CLEANUP ==========
diff -udr ../nmh-0.19.ORIG/uip/Makefile.in ./uip/Makefile.in
--- ../nmh-0.19.ORIG/uip/Makefile.in Thu Dec 4 02:16:04 1997
+++ ./uip/Makefile.in Mon Jan 5 20:29:16 1998
@@ -13,7 +13,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-libdir = @libdir@
+libexecdir = @libexecdir@
etcdir = @sysconfdir@
CC = @CC@
@@ -235,9 +235,9 @@
# install misc support binaries
install-misc:
- $(top_srcdir)/mkinstalldirs $(libdir)
+ $(top_srcdir)/mkinstalldirs $(libexecdir)
for misc in $(MISC); do \
- $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
+ $(INSTALL_PROGRAM) $$misc $(libexecdir)/$$misc; \
done
uninstall:
@@ -248,7 +248,7 @@
rm -f $(bindir)/$$lcmd; \
done
for misc in $(MISC); do \
- rm -f $(libdir)/$$misc; \
+ rm -f $(libexecdir)/$$misc; \
done
# ========== DEPENDENCIES FOR CLEANUP ==========
diff -udr ../nmh-0.19.ORIG/config/Makefile.in ./config/Makefile.in
--- ../nmh-0.19.ORIG/config/Makefile.in Sat Jul 26 06:38:57 1997
+++ ./config/Makefile.in Mon Jan 5 22:02:45 1998
@@ -17,6 +17,7 @@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
+libexecdir = @libexecdir@
etcdir = @sysconfdir@
default_editor = @vipath@
@@ -26,7 +27,7 @@
CFLAGS = @CFLAGS@
DEFS = @DEFS@
INCLUDES = -I.. -I$(top_srcdir)
-CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
+CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' -DNMHLIBEXECDIR='"$(libexecdir)"' \
-DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"'
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)