aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2023-08-04 12:23:42 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2023-08-04 12:24:38 +0000
commita8d80b64596d24bf1c339034bdc8d2ab5dd01eba (patch)
tree9f45b0571f71d621579cf6f6d15ae06937463208
parentbb8ae962c569abc249e1772b22f131b9d9c8c16f (diff)
downloadports-a8d80b64596d24bf1c339034bdc8d2ab5dd01eba.tar.gz
ports-a8d80b64596d24bf1c339034bdc8d2ab5dd01eba.zip
x11/ly: fix forgotten makefile update
When upgrading to 0.6.0 I have updated the makefile patch but actually forgot to push it.
-rw-r--r--x11/ly/files/patch-makefile23
1 files 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"