diff options
| author | Roland Hieber <rohieb@rohieb.name> | 2017-06-12 20:37:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-06-21 10:14:53 +0200 |
| commit | 5c399086e7694bb4a9295d9dcdfe7467a3329c7a (patch) | |
| tree | 5e7ca18a6595ecea0b25f48e6abe40b2aca448c6 /patches/lrzsz-0.12.20 | |
| parent | caa39e0714730c2ae84f9aa3ee93aecee7b3173d (diff) | |
| download | ptxdist-5c399086e7694bb4a9295d9dcdfe7467a3329c7a.tar.gz ptxdist-5c399086e7694bb4a9295d9dcdfe7467a3329c7a.tar.xz | |
lrzsz: install into DESTDIR in all cases
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/lrzsz-0.12.20')
| -rw-r--r-- | patches/lrzsz-0.12.20/0001-Makefile-with-DESTDIR-don-t-act-on-usr-bin.patch | 55 | ||||
| -rw-r--r-- | patches/lrzsz-0.12.20/series | 4 |
2 files changed, 59 insertions, 0 deletions
diff --git a/patches/lrzsz-0.12.20/0001-Makefile-with-DESTDIR-don-t-act-on-usr-bin.patch b/patches/lrzsz-0.12.20/0001-Makefile-with-DESTDIR-don-t-act-on-usr-bin.patch new file mode 100644 index 000000000..8661d99b8 --- /dev/null +++ b/patches/lrzsz-0.12.20/0001-Makefile-with-DESTDIR-don-t-act-on-usr-bin.patch @@ -0,0 +1,55 @@ +From: Roland Hieber <r.hieber@pengutronix.de> +Date: Mon, 12 Jun 2017 19:32:52 +0200 +Subject: [PATCH] Makefile: with DESTDIR, don't act on /usr/bin + +Makefile.in was manually updated because I could not dig up old enough +autotools that would regenerate it without errors. + +Signed-off-by: Roland Hieber <r.hieber@pengutronix.de> +--- + src/Makefile.am | 6 +++--- + src/Makefile.in | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index dd0a56c6ad8b..287b09e39c36 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -18,13 +18,13 @@ install-exec-local: + rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lsx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lrb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lrx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` + # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` +diff --git a/src/Makefile.in b/src/Makefile.in +index d7846b6a2672..a410595d0730 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -372,13 +372,13 @@ install-exec-local: + rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lsx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lrb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)/$(bindir)/`echo lrx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` + # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` diff --git a/patches/lrzsz-0.12.20/series b/patches/lrzsz-0.12.20/series new file mode 100644 index 000000000..a170ac653 --- /dev/null +++ b/patches/lrzsz-0.12.20/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile-with-DESTDIR-don-t-act-on-usr-bin.patch +# 78944bb019fb35e94820ca202a618489 - git-ptx-patches magic |