Skip to content

Commit

Permalink
x11/ly: fix forgotten makefile update
Browse files Browse the repository at this point in the history
When upgrading to 0.6.0 I have updated the makefile patch but
actually forgot to push it.
  • Loading branch information
bapt committed Aug 4, 2023
1 parent bb8ae96 commit a8d80b6
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions x11/ly/files/patch-makefile
Expand Up @@ -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)
Expand All @@ -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"

0 comments on commit a8d80b6

Please sign in to comment.