projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed --with-smtpservers configure option and thelike
[mmh]
/
etc
/
Makefile.in
diff --git
a/etc/Makefile.in
b/etc/Makefile.in
index
66e42ad
..
0580723
100644
(file)
--- a/
etc/Makefile.in
+++ b/
etc/Makefile.in
@@
-1,8
+1,6
@@
#
# Makefile for etc subdirectory
#
#
# Makefile for etc subdirectory
#
-# $Id$
-#
SHELL = /bin/sh
SHELL = /bin/sh
@@
-19,7
+17,6
@@
etcdir = @sysconfdir@
MTS = @MTS@
mailspool = @mailspool@
masquerade = @masquerade@
MTS = @MTS@
mailspool = @mailspool@
masquerade = @masquerade@
-smtpservers = @smtpservers@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@
-76,8
+73,7
@@
mts.conf: $(srcdir)/mts.conf.in Makefile
$(SED) -e 's,%mts%,$(MTS),' \
-e 's,%mailspool%,$(mailspool),' \
-e 's,%etcdir%,$(etcdir),' \
$(SED) -e 's,%mts%,$(MTS),' \
-e 's,%mailspool%,$(mailspool),' \
-e 's,%etcdir%,$(etcdir),' \
- -e 's,%masquerade%,$(masquerade),' \
- -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
+ -e 's,%masquerade%,$(masquerade),' < $(srcdir)/mts.conf.in > $@
sendfiles: $(srcdir)/sendfiles.in Makefile
rm -f $@
sendfiles: $(srcdir)/sendfiles.in Makefile
rm -f $@
@@
-100,18
+96,12
@@
install-etc-files:
for path in $$INSTALL_FILES; do \
file=`basename $$path`; \
echo "Installing $$file..."; \
for path in $$INSTALL_FILES; do \
file=`basename $$path`; \
echo "Installing $$file..."; \
- if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
- mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
- if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
- rm $(DESTDIR)$(etcdir)/$$file.prev; \
+ if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
+ if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file"; then \
+ echo "$(DESTDIR)$(etcdir)/$$file unchanged, skipped"; \
else \
else \
- echo; \
- echo " Previous version of $$file saved as $$file.prev due\c";\
- echo " to diffs."; \
- echo " Please merge any local config changes into the new\c"; \
- echo " $$file."; \
- echo; \
+ $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+ echo "INFO: $(DESTDIR)$(etcdir)/$$file installed with .dist extension"; \
fi; \
else \
$(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
fi; \
else \
$(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \