diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-09 21:26:18 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-10 15:40:57 +0100 |
| commit | 92941902dc6d89f9558b1b3398ab3bc28fba75d8 (patch) | |
| tree | e7263bbb7796db12cdde39e718c506a06fde3675 /patches/ssmtp-2.64 | |
| parent | 7a447a643668b7b20209e3a1cfcb13672a542586 (diff) | |
| download | ptxdist-92941902dc6d89f9558b1b3398ab3bc28fba75d8.tar.gz ptxdist-92941902dc6d89f9558b1b3398ab3bc28fba75d8.tar.xz | |
[ssmtp] cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/ssmtp-2.64')
| -rw-r--r-- | patches/ssmtp-2.64/series | 1 | ||||
| -rw-r--r-- | patches/ssmtp-2.64/ssmtp-2.64-destdir.diff | 7 | ||||
| -rw-r--r-- | patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff | 34 |
3 files changed, 42 insertions, 0 deletions
diff --git a/patches/ssmtp-2.64/series b/patches/ssmtp-2.64/series index 99d0bd38e..eb2612119 100644 --- a/patches/ssmtp-2.64/series +++ b/patches/ssmtp-2.64/series @@ -1,2 +1,3 @@ ssmtp-2.61-ldflags.diff ssmtp-2.64-destdir.diff +ssmtp-2.64-non-interactive-install.diff diff --git a/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff b/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff index a5c6febd8..dc862ee95 100644 --- a/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff +++ b/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff @@ -1,3 +1,10 @@ +Subject: [PATCH] use DESTDIR when installing +From: Robert Schwebel <r.schwebel@pengutronix.de> + +Prefix all paths with DESTDIR when installing + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- Makefile.in | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff b/patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff new file mode 100644 index 000000000..7c1564fe6 --- /dev/null +++ b/patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff @@ -0,0 +1,34 @@ +Subject: make installing non-interactive +From: Michael Olbrich <m.olbrich@pengutronix.de> + +$(GEN_CONFIG) need user ineraction to create a config file. +It doesn't work for cross-compiling and we don't need it. + +Not for upstream. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + Makefile.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -45,14 +45,13 @@ all: ssmtp + latex $< + + .PHONY: install +-install: ssmtp $(GEN_CONFIG) ++install: ssmtp + $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) + $(INSTALL) -s -m 755 ssmtp $(DESTDIR)$(bindir)/ssmtp + $(INSTALL) -d -m 755 $(DESTDIR)$(mandir) + $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(DESTDIR)$(mandir)/ssmtp.8 + $(INSTALL) -d -m 755 $(DESTDIR)$(SSMTPCONFDIR) + $(INSTALL) -m 644 $(srcdir)/revaliases $(DESTDIR)$(INSTALLED_REVALIASES_FILE) +- $(GEN_CONFIG) $(DESTDIR)$(INSTALLED_CONFIGURATION_FILE) + + + .PHONY: install-sendmail |