Archives
Archives
| From: | "Kacper Kowalik (xarthisius)" <xarthisius@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-misc/oroborus-desklaunch/files: oroborus-desklaunch-1.1.7-gentoo.diff |
| Date: | Mon, 31 May 2010 15:45:21 |
| Message-Id: | 20100531154518.76AAE2CF39@corvid.gentoo.org |
| 1 | xarthisius 10/05/31 15:45:18 |
| 2 | |
| 3 | Added: oroborus-desklaunch-1.1.7-gentoo.diff |
| 4 | Log: |
| 5 | New ebuild for oroborus-desklaunch, formerly part of x11-wm/oroborus-extras |
| 6 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: oroborus-desklaunch-1.1.7-gentoo.diff |
| 15 | =================================================================== |
| 16 | --- Makefile |
| 17 | +++ Makefile |
| 18 | @@ -1,29 +1,26 @@ |
| 19 | -CC = gcc |
| 20 | -CFLAGS = -g -O2 -Wall |
| 21 | -XROOT = /usr/X11R6 |
| 22 | -INCLUDES = -I$(XROOT)/include |
| 23 | -LIBS = -lX11 -lXext -lXpm |
| 24 | -LDPATH = -L$(XROOT)/lib |
| 25 | +INCLUDES = `pkg-config --cflags x11 xext xpm` |
| 26 | +LIBS = `pkg-config --libs x11 xext xpm` |
| 27 | |
| 28 | -DESTDIR = |
| 29 | PROG = desklaunch |
| 30 | PREFIX = $(DESTDIR)/usr |
| 31 | +MANDIR = $(PREFIX)/share/man |
| 32 | RCFILE = .$(PROG)rc |
| 33 | DEFINES = -DRCFILE=\"$(RCFILE)\" #-DDEBUG |
| 34 | |
| 35 | OBJS = $(PROG).o |
| 36 | +MAN = debian/$(PROG).1 |
| 37 | |
| 38 | all: $(PROG) |
| 39 | |
| 40 | $(PROG): $(OBJS) |
| 41 | - $(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@ |
| 42 | + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ |
| 43 | |
| 44 | $(OBJS): %.o: %.c $(HEADERS) |
| 45 | $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ |
| 46 | |
| 47 | install: all |
| 48 | - install $(PROG) $(PREFIX)/bin |
| 49 | - install -d $(PREFIX)/share/$(PROG) |
| 50 | + install -D -m 755 $(PROG) $(PREFIX)/bin/$(PROG) |
| 51 | + install -D -m 644 $(MAN) $(MANDIR)/man1/$(PROG).1 |
| 52 | |
| 53 | uninstall: |
| 54 | rm -f $(PREFIX)/bin/$(PROG) |