Date: Fri, 4 Aug 2023 12:24:40 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a8d80b64596d - main - x11/ly: fix forgotten makefile update Message-ID: <202308041224.374COe6G019573@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8d80b64596d24bf1c339034bdc8d2ab5dd01eba commit a8d80b64596d24bf1c339034bdc8d2ab5dd01eba Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2023-08-04 12:23:42 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2023-08-04 12:24:38 +0000 x11/ly: fix forgotten makefile update When upgrading to 0.6.0 I have updated the makefile patch but actually forgot to push it. --- x11/ly/files/patch-makefile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/x11/ly/files/patch-makefile b/x11/ly/files/patch-makefile index 6df28fdfe1a8..d8da24fa3b66 100644 --- a/x11/ly/files/patch-makefile +++ b/x11/ly/files/patch-makefile @@ -20,6 +20,15 @@ BIND = bin OBJD = obj +@@ -20,7 +24,7 @@ TESTD = tests + RESD = res + TESTD = tests + +-DATADIR ?= ${DESTDIR}/etc/ly ++DATADIR ?= ${DESTDIR}$(PREFIX)/etc/ly + FLAGS+= -DDATADIR=\"$(DATADIR)\" + + INCL = -I$(SRCD) @@ -71,14 +75,14 @@ install: $(BIND)/$(NAME) install: $(BIND)/$(NAME) @@ -32,14 +41,14 @@ - @install -dZ $(DATADIR)/lang - @install -DZ $(RESD)/lang/* -t $(DATADIR)/lang - @install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d -+ @install -d ${DESTDIR}/etc/ly -+ @install $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin -+ @install $(RESD)/config.ini -t ${DESTDIR}/etc/ly -+ @install $(RESD)/xsetup.sh -t $(DATADIR) -+ @install $(RESD)/wsetup.sh -t $(DATADIR) ++ @install -d ${DESTDIR}$(PREFIX)/etc/ly ++ @install $(BIND)/$(NAME) ${DESTDIR}$(PREFIX)/bin ++ @install $(RESD)/config.ini ${DESTDIR}$(PREFIX)/etc/ly ++ @install $(RESD)/xsetup.sh $(DATADIR) ++ @install $(RESD)/wsetup.sh $(DATADIR) + @install -d $(DATADIR)/lang -+ @install $(RESD)/lang/* -t $(DATADIR)/lang -+ @install $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d ++ @install $(RESD)/lang/* $(DATADIR)/lang ++ @install -m 644 $(RESD)/pam.d/ly ${DESTDIR}$(PREFIX)/etc/pam.d installnoconf: $(BIND)/$(NAME) @echo "installing ly without the configuration file"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308041224.374COe6G019573>