diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-05 22:24:56 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-05 22:24:56 +0100 |
| commit | e8fb15fdf6b917e990f8e23e5117ce7a9e179da0 (patch) | |
| tree | 0535689cf001962ce87f2b91430919f3de438a44 /patches/ssmtp-2.64 | |
| parent | 68c966e3861aeeef44eb4152f3b1b91ac43f029b (diff) | |
| download | ptxdist-e8fb15fdf6b917e990f8e23e5117ce7a9e179da0.tar.gz ptxdist-e8fb15fdf6b917e990f8e23e5117ce7a9e179da0.tar.xz | |
[ssmtp] cleanup make file
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/ssmtp-2.64')
| -rw-r--r-- | patches/ssmtp-2.64/series | 2 | ||||
| -rw-r--r-- | patches/ssmtp-2.64/ssmtp-2.64-destdir.diff | 65 | ||||
| -rw-r--r-- | patches/ssmtp-2.64/ssmtp-2.64-nostrip.diff | 25 |
3 files changed, 92 insertions, 0 deletions
diff --git a/patches/ssmtp-2.64/series b/patches/ssmtp-2.64/series index bc0db162e..bc99a07e2 100644 --- a/patches/ssmtp-2.64/series +++ b/patches/ssmtp-2.64/series @@ -1 +1,3 @@ ssmtp-2.61-ldflags.diff +ssmtp-2.64-destdir.diff +ssmtp-2.64-nostrip.diff diff --git a/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff b/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff new file mode 100644 index 000000000..a5c6febd8 --- /dev/null +++ b/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff @@ -0,0 +1,65 @@ +--- + Makefile.in | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +Index: ssmtp-2.64/Makefile.in +=================================================================== +--- ssmtp-2.64.orig/Makefile.in ++++ ssmtp-2.64/Makefile.in +@@ -46,36 +46,36 @@ all: ssmtp + + .PHONY: install + install: ssmtp $(GEN_CONFIG) +- $(INSTALL) -d -m 755 $(bindir) +- $(INSTALL) -s -m 755 ssmtp $(bindir)/ssmtp +- $(INSTALL) -d -m 755 $(mandir) +- $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8 +- $(INSTALL) -d -m 755 $(SSMTPCONFDIR) +- $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE) +- $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE) ++ $(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 + install-sendmail: install +- $(RM) $(bindir)/sendmail +- $(LN_S) ssmtp $(bindir)/sendmail +- $(INSTALL) -d -m 755 $(libexecdir) +- $(RM) $(libexecdir)/sendmail +- $(LN_S) sendmail /lib/sendmail +- $(RM) $(mandir)/sendmail.8 +- $(LN_S) ssmtp.8 $(mandir)/sendmail.8 ++ $(RM) $(DESTDIR)$(bindir)/sendmail ++ $(LN_S) ssmtp $(DESTDIR)$(bindir)/sendmail ++ $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) ++ $(RM) $(DESTDIR)$(libexecdir)/sendmail ++ $(LN_S) sendmail $(DESTDIR)/lib/sendmail ++ $(RM) $(DESTDIR)$(mandir)/sendmail.8 ++ $(LN_S) ssmtp.8 $(DESTDIR)$(mandir)/sendmail.8 + + .PHONY: uninstall + uninstall: +- $(RM) $(bindir)/ssmtp +- $(RM) $(mandir)/ssmtp.8 +- $(RM) $(CONFIGURATION_FILE) $(REVALIASES_FILE) +- $(RM) -r $(SSMTPCONFDIR) ++ $(RM) $(DESTDIR)$(bindir)/ssmtp ++ $(RM) $(DESTDIR)$(mandir)/ssmtp.8 ++ $(RM) $$(DESTDIR)(CONFIGURATION_FILE) $(DESTDIR)$(REVALIASES_FILE) ++ $(RM) -r $(DESTDIR)$(SSMTPCONFDIR) + + .PHONY: uninstall-sendmail + uninstall-sendmail: uninstall +- $(RM) $(bindir)/sendmail /lib/sendmail +- $(RM) $(mandir)/sendmail.8 ++ $(RM) $(DESTDIR)$(bindir)/sendmail $(DESTDIR)/lib/sendmail ++ $(RM) $(DESTDIR)$(mandir)/sendmail.8 + + # Binaries: + ssmtp: $(OBJS) diff --git a/patches/ssmtp-2.64/ssmtp-2.64-nostrip.diff b/patches/ssmtp-2.64/ssmtp-2.64-nostrip.diff new file mode 100644 index 000000000..d5f70dfb5 --- /dev/null +++ b/patches/ssmtp-2.64/ssmtp-2.64-nostrip.diff @@ -0,0 +1,25 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> + +Using install -s doesn't work when cross building: + +strip: Unable to recognise the format of the input file `/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/packages/ssmtp-2.64/usr/sbin/ssmtp' + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: ssmtp-2.64/Makefile.in +=================================================================== +--- ssmtp-2.64.orig/Makefile.in ++++ ssmtp-2.64/Makefile.in +@@ -47,7 +47,7 @@ all: ssmtp + .PHONY: install + install: ssmtp $(GEN_CONFIG) + $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) +- $(INSTALL) -s -m 755 ssmtp $(DESTDIR)$(bindir)/ssmtp ++ $(INSTALL) -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) |