commit b2c32475a01b80d365834641de0fd187a4673bb6 parent b332ce611bca5a37dca8c99441c21ac54e880ff3 Author: Chris Guillott <chris@techfo.xyz> Date: Sun, 27 Mar 2016 21:07:11 -0400 Merge pull request #1 from meskarune/master changed package so it creates an i3lock binary instead of i3lock-colo… Diffstat:
| M | Makefile | | | 28 | ++++++++++++++-------------- |
| R | i3lock-color.1 -> i3lock.1 | | | 0 | |
| R | i3lock-color.pam -> i3lock.pam | | | 0 |
3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile @@ -28,31 +28,31 @@ CPPFLAGS += -DVERSION=\"${GIT_VERSION}\" .PHONY: install clean uninstall -all: i3lock-color +all: i3lock -i3lock-color: ${FILES} +i3lock: ${FILES} $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) clean: - rm -f i3lock-color ${FILES} i3lock-color-${VERSION}.tar.gz + rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz install: all $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d - $(INSTALL) -m 755 i3lock-color $(DESTDIR)$(PREFIX)/bin/i3lock-color - $(INSTALL) -m 644 i3lock-color.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock-color - gzip -kf i3lock-color.1 - $(INSTALL) -m 644 i3lock-color.1.gz $(MANDIR)/man1/i3lock-color.1.gz + $(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock + $(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock + gzip -kf i3lock.1 + $(INSTALL) -m 644 i3lock.1.gz $(MANDIR)/man1/i3lock.1.gz uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/i3lock-color - rm -f $(MANDIR)/man1/i3lock-color.1.gz + rm -f $(DESTDIR)$(PREFIX)/bin/i3lock + rm -f $(MANDIR)/man1/i3lock.1.gz dist: clean - [ ! -d i3lock-color-${VERSION} ] || rm -rf i3lock-color-${VERSION} - [ ! -e i3lock-color-${VERSION}.tar.bz2 ] || rm i3lock-color-${VERSION}.tar.bz2 + [ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION} + [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} - cp *.c *.h i3lock-color.1.gz i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} + cp *.c *.h i3lock.1.gz i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile - tar cfj i3lock-color-${VERSION}.tar.bz2 i3lock-color-${VERSION} - rm -rf i3lock-color-${VERSION} + tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION} + rm -rf i3lock-${VERSION} diff --git a/i3lock-color.1 b/i3lock.1 diff --git a/i3lock-color.pam b/i3lock.pam