public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-plugins/wmCalClock/files: wmCalClock-1.25-makefile.patch
@ 2008-02-12 16:24 Michele Noberasco (s4t4n)
  0 siblings, 0 replies; only message in thread
From: Michele Noberasco (s4t4n) @ 2008-02-12 16:24 UTC (permalink / raw
  To: gentoo-commits

s4t4n       08/02/12 16:24:04

  Added:                wmCalClock-1.25-makefile.patch
  Log:
  Revision bump, see bug #207758.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch?rev=1.1&content-type=text/plain

Index: wmCalClock-1.25-makefile.patch
===================================================================
--- Makefile.orig	1999-03-27 07:46:38.000000000 +0100
+++ Makefile	2008-01-27 22:45:09.000000000 +0100
@@ -1,8 +1,8 @@
-CC     = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+CC     ?= gcc
+CFLAGS += -Wall
+INCDIR = -I/usr/include/X11 -I/usr/include
+PREFIX ?= /usr
+LIBDIR ?= /usr/lib
 
 # for Linux
 LIBS   = -lXpm -lX11 -lXext
@@ -22,7 +22,7 @@
 
 wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
 wmCalClock:	$(OBJS) 
-	$(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) -o wmCalClock $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -31,6 +31,7 @@
 	rm -f wmCalClock
 
 install:: wmCalClock
-	install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
-	install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 
+	install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
+	install -m 0755 wmCalClock $(DESTDIR)$(PREFIX)/bin
+	install -m 0644 wmCalClock.1 $(DESTDIR)$(PREFIX)/share/man/man1
 



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-02-12 16:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-12 16:24 [gentoo-commits] gentoo-x86 commit in x11-plugins/wmCalClock/files: wmCalClock-1.25-makefile.patch Michele Noberasco (s4t4n)

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