Attachment 240358 Details for Bug 269584 – [patch] fix broken Makefile patch (v2)

[patch] [patch] fix broken Makefile patch (v2)

pr-debootstrap-fix-patch-Makefile-v2.diff (text/plain), 1.07 KB, created by John Hein on 2023-02-24 01:55:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-02-24 01:55:14 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/sysutils/debootstrap/files/patch-Makefile b/sysutils/debootstrap/files/patch-Makefile
>index 79638ff023e8..789af0e40999 100644
>--- a/sysutils/debootstrap/files/patch-Makefile
>+++ b/sysutils/debootstrap/files/patch-Makefile
>@@ -5,11 +5,11 @@
>  clean:
>  
> -DSDIR=$(DESTDIR)/usr/share/debootstrap
>-+DSDIR=$(DESTDIR)/usr/local/share/debootstrap
>++DSDIR=$(DESTDIR)%%DATADIR%%
>  install:
>  	mkdir -p $(DSDIR)/scripts
> -	mkdir -p $(DESTDIR)/usr/sbin
>-+	mkdir -p $(DESTDIR)/usr/local/sbin
>++	mkdir -p $(DESTDIR)%%PREFIX%%/sbin
>  
>  	cp -a scripts/* $(DSDIR)/scripts/
> -	install -o root -g root -m 0644 functions $(DSDIR)/
>@@ -18,5 +18,5 @@
> -	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
> -	chown root:root $(DESTDIR)/usr/sbin/debootstrap
> -	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
>-+	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/local/sbin/debootstrap
>-+	chmod 0755 $(DESTDIR)/usr/local/sbin/debootstrap
>++	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap
>++	chmod 0755 $(DESTDIR)%%PREFIX%%/sbin/debootstrap

Actions: View | Diff

Attachments on bug 269584: 240180 | 240215 | 240358 | 240382