| 1 |
xarthisius 10/05/30 15:40:26 |
| 2 |
|
| 3 |
Added: windowlab-1.40-gentoo.diff |
| 4 |
Log: |
| 5 |
Version bump. Thanks to Tomáš Hlušička <tomas.hlusicka@××××××.cz> for report |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-wm/windowlab/files/windowlab-1.40-gentoo.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: windowlab-1.40-gentoo.diff |
| 15 |
=================================================================== |
| 16 |
--- Makefile.orig 2009-11-05 21:04:45.000000000 +0000 |
| 17 |
+++ Makefile 2010-05-30 15:31:04.047559352 +0000 |
| 18 |
@@ -5,18 +5,18 @@ |
| 19 |
EXTRA_LIBS += -lXext |
| 20 |
|
| 21 |
# Set this to the hardcoded location of all files if it's not / |
| 22 |
-PREFIX = /usr/local |
| 23 |
+PREFIX = /usr |
| 24 |
|
| 25 |
# Set this to the directory, below PREFIX, where man pages |
| 26 |
# are expected. Below this directory, the target "install" |
| 27 |
# will put "windowlab.1x" in section "man1". |
| 28 |
-MANBASE = /man |
| 29 |
+MANBASE = /share/man |
| 30 |
|
| 31 |
# Set this to the location of the X installation you want to compile against |
| 32 |
-XROOT = /usr/X11R6 |
| 33 |
+XROOT = /usr |
| 34 |
|
| 35 |
# Some flexibility for configuration location |
| 36 |
-CONFPREFIX = $(PREFIX) |
| 37 |
+CONFPREFIX = |
| 38 |
CONFDIR = /etc/X11/windowlab |
| 39 |
|
| 40 |
# Set this to the location of the global configuration files |
| 41 |
@@ -43,7 +43,6 @@ |
| 42 |
|
| 43 |
# -------------------------------------------------------------------- |
| 44 |
|
| 45 |
-CC = gcc |
| 46 |
ifndef CFLAGS |
| 47 |
CFLAGS = -g -O2 -Wall -W |
| 48 |
endif |
| 49 |
@@ -63,15 +62,15 @@ |
| 50 |
all: $(PROG) |
| 51 |
|
| 52 |
$(PROG): $(OBJS) |
| 53 |
- $(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@ |
| 54 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@ |
| 55 |
|
| 56 |
$(OBJS): %.o: %.c $(HEADERS) |
| 57 |
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ |
| 58 |
|
| 59 |
install: all |
| 60 |
- mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR) |
| 61 |
- mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE) |
| 62 |
- mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc |
| 63 |
+ install -D -m 755 $(PROG) $(BINDIR)/$(PROG) |
| 64 |
+ install -D -m 644 $(MANPAGE) $(MANDIR)/windowlab.1 |
| 65 |
+ install -D -m 644 windowlab.menurc $(CFGDIR)/windowlab.menurc |
| 66 |
|
| 67 |
clean: |
| 68 |
rm -f $(PROG) $(OBJS) |
Archives