public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-misc/i3lock/files: i3lock-2.1-makefile.patch
@ 2011-07-22  9:41 Kacper Kowalik (xarthisius)
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2011-07-22  9:41 UTC (permalink / raw
  To: gentoo-commits

xarthisius    11/07/22 09:41:18

  Added:                i3lock-2.1-makefile.patch
  Log:
  Initial import. Ebuild written by me
  
  (Portage version: 2.2.0_alpha45/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/i3lock/files/i3lock-2.1-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3lock/files/i3lock-2.1-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3lock/files/i3lock-2.1-makefile.patch?rev=1.1&content-type=text/plain

Index: i3lock-2.1-makefile.patch
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -10,30 +10,30 @@
 CFLAGS += -std=c99
 CFLAGS += -pipe
 CFLAGS += -Wall
-CFLAGS += -D_GNU_SOURCE
+CPPFLAGS += -D_GNU_SOURCE
 ifndef NOLIBCAIRO
 CFLAGS += $(shell pkg-config --cflags cairo xcb-keysyms xcb-dpms)
-LDFLAGS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image)
+LIBS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image)
 else
 CFLAGS += -DNOLIBCAIRO
 CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms)
-LDFLAGS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image)
+LIBS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image)
 endif
-LDFLAGS += -lpam
+LIBS += -lpam
 
 FILES:=$(wildcard *.c)
 FILES:=$(FILES:.c=.o)
 
 VERSION:=2.1
 GIT_VERSION:="2.1 (2011-03-13)"
-CFLAGS += -DVERSION=\"${GIT_VERSION}\"
+CPPFLAGS += -DVERSION=\"${GIT_VERSION}\"
 
 .PHONY: install clean uninstall
 
 all: i3lock
 
 i3lock: ${FILES}
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz
@@ -41,8 +41,12 @@
 install: all
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/doc/i3lock-${VERSION}
 	$(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock
 	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock
+	$(INSTALL) -m 644 i3lock.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 644 README $(DESTDIR)$(PREFIX)/share/doc/i3lock-${VERSION}
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/i3lock






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-misc/i3lock/files: i3lock-2.1-makefile.patch
@ 2011-11-07 19:23 Kacper Kowalik (xarthisius)
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2011-11-07 19:23 UTC (permalink / raw
  To: gentoo-commits

xarthisius    11/11/07 19:23:44

  Removed:              i3lock-2.1-makefile.patch
  Log:
  Version bump, drop old. Fixes bug 389733 by Simeon Maryasin
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-07 19:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-22  9:41 [gentoo-commits] gentoo-x86 commit in x11-misc/i3lock/files: i3lock-2.1-makefile.patch Kacper Kowalik (xarthisius)
  -- strict thread matches above, loose matches on Subject: below --
2011-11-07 19:23 Kacper Kowalik (xarthisius)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox